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

2022-04-28 15:13:57 +08:00
parent 92ef67a236 18378cc8a2
commit e0d10116da
29 changed files with 288 additions and 150 deletions
--- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts
+++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts
@ -125,7 +125,7 @@ export class SupplyManagementBulkDetailComponent implements OnInit {
     */
  placeOrder(record: any) {
    console.log(record)
-    this.router.navigate(['/supply-management/bulk-amend', record.id], {
+    this.router.navigate(['/supply-management/bulk-next', record.id], {
      queryParams: {
        sta: 4
      },
--- a/src/app/routes/supply-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts
@ -492,7 +492,7 @@ export class SupplyManagementBulkComponent extends BasicTableComponent implement

  //  再下一单
  nextOrder(item: any) {
-    this.router.navigate(['/supply-management/bulk-amend', item.id], {
+    this.router.navigate(['/supply-management/bulk-next', item.id], {
      queryParams: {
        sta: 4
      }
--- a/src/app/routes/supply-management/components/index/index.component.html
+++ b/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>
--- a/src/app/routes/supply-management/components/index/index.component.ts
+++ b/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 = acl.data.full || !!acls.find(acl => acl === 'SUPPLY-INDEX-vehicleSearch');
+    this.isShowBulk = acl.data.full || !!acls.find(acl => acl === 'SUPPLY-INDEX-bulkSearch');
+  }

  ngOnInit(): void {}
 }
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
@ -260,9 +260,9 @@
    <button *ngIf="this.PageStatus == '整车修改'" nz-button nzType="primary" style="margin-left: 48px"
      (click)="submitConfirm()" acl [acl-ability]="['SUPPLY-VEHICLE-AMEND-submitChange']">提交修改</button>
    <button nz-button nzType="primary" *ngIf="this.PageStatus == '整车下一单'" (click)="submitConfirm('assign')" acl
-      [acl-ability]="['SUPPLY-BULK-PLACEORDER-vehicleDesignate']">指派熟车</button>
+      [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate']">指派熟车</button>
    <button *ngIf="this.PageStatus == '整车下一单'" nz-button nzType="primary" style="margin-left: 48px"
      (click)="submitConfirm('publish')" acl
-      [acl-ability]="['SUPPLY-BULK-PLACEORDER-vehicleAnotherOrder']">司机抢单</button>
+      [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder']">司机抢单</button>
  </div>
 </nz-card>
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
@ -6,39 +6,6 @@
          <i nz-icon nzType="left" nzTheme="outline"></i>
        </button>
      </ng-template>
-      <ng-template #headerContent>
-        <div class="mb-xs" nz-row>
-          <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
-          <h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
-        </div>
-        <div nz-row>
-          <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.enterpriseInfoName }}</div>
-          <div nz-col nzSpan="10">
-            <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
-              [acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button>
-            <button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'" acl
-              [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button>
-            <button nz-button (click)="updateGoodsSource(i)"
-              *ngIf="i?.resourceStatus === '1' && i.insurancePayment !== 'Y'" acl
-              [acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button>
-            <button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl
-              [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button>
-          </div>
-        </div>
-        <div class="mt-sm mb-sm" nz-row>
-          <div>
-            <b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency }}</span></b>
-          </div>
-        </div>
-        <nz-divider></nz-divider>
-        <div sv-container *ngIf="i">
-          <sv label="外部货源号">{{ i?.externalResourceCode }} </sv>
-          <sv label="项目">{{ i?.enterpriseProjectName }}</sv>
-          <sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
-          <sv label="调度员">{{ i?.dispatchName }}/{{ i?.dispatchPhone }} </sv>
-          <sv label="服务类型">{{ i?.serviceTypeLabel }} </sv>
-        </div>
-      </ng-template>
    </page-header-wrapper>
    <nz-card [nzBorderless]="true" class="mb0">
      <div class="mb-xs" nz-row>
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
@ -115,18 +115,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
    })
  }

-  /**
-   *再下一单
-   * @param record
-   */
-  placeOrder(record: any) {
-    this.router.navigate(['./pbg/onecar-publish'], {
-      queryParams: {
-        id: record?.id,
-        type: 'add'
-      }
-    })
-  }
+
  /**
  * 编辑外部货源号
  * @param item st当前行对象
@ -168,7 +157,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
    });
  }
  nextOrder(item: any) {
-    this.router.navigate(['/supply-management/vehicle-amend', item.id], {
+    this.router.navigate(['/supply-management/vehicle-next', item.id], {
      queryParams: {
        sta: 2
      }
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@ -324,7 +324,7 @@ export class SupplyManagementVehicleComponent extends BasicTableComponent implem
    });
  }
  nextOrder(item: any) {
-    this.router.navigate(['/supply-management/vehicle-amend', item.id], {
+    this.router.navigate(['/supply-management/vehicle-next', item.id], {
      queryParams: {
        sta: 2
      }
--- a/src/app/routes/supply-management/supply-management-routing.module.ts
+++ b/src/app/routes/supply-management/supply-management-routing.module.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-03 11:10:14
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-10 14:39:00
+ * @LastEditTime : 2022-04-28 14:45:50
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\supply-management-routing.module.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -21,13 +21,76 @@ 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/vehicle-detail/:id', component: SupplyManagementVehicleDetailComponent },
+  {
+    path: 'index',
+    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-release', component: SupplyManagementReleasePublishComponent },
-  { path: 'bulk-release', component: SupplyManagementBulkReleasePublishComponent },
+  {
+    path: 'vehicle-amend/:id',
+    component: SupplyManagementOnecarPublishComponent,
+    data: {
+      guard: {
+        ability: ['SUPPLY-VEHICLE-AMEND-submitChange']
+      }
+    }
+  },
+  {
+    path: 'vehicle-next/:id',
+    component: SupplyManagementOnecarPublishComponent,
+    data: {
+      guard: {
+        ability: [
+          'SUPPLY-VEHICLE-PLACEORDER-QRCode',
+          'SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate',
+          'SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder'
+        ]
+      }
+    }
+  },
+  {
+    path: 'vehicle-release',
+    component: SupplyManagementReleasePublishComponent,
+    data: {
+      guard: { ability: ['SUPPLY-VEHICLE-RELEASE-bulkDesignate', 'SUPPLY-VEHICLE-RELEASE-bulkDriverOrder'] }
+    }
+  },
+  {
+    path: 'bulk-release',
+    component: SupplyManagementBulkReleasePublishComponent,
+    data: {
+      guard: { ability: ['SUPPLY-BULK-RELEASE-consignBulkAssign', 'SUPPLY-BULK-RELEASE-consignBulk'] }
+    }
+  },
+  {
+    path: 'bulk-next/:id',
+    component: SupplyManagementBulkPublishComponent,
+    data: {
+      guard: { ability: ['SUPPLY-BULK-PLACEORDER-vehicleAnotherOrder', 'SUPPLY-BULK-PLACEORDER-vehicleDesignate'] }
+    }
+  },
  { path: 'bulk-amend/:id', component: SupplyManagementBulkPublishComponent }
 ];