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

src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-08 16:34:26
+ * @LastEditTime : 2022-04-29 10:41:20
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\abnormal-warning\\abnormal-warning.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -35,25 +35,27 @@
   <div class="header_box">
     <label class="page_title"> <label class="driver">|</label> 异常预警</label>
     <div class="mr-sm">
-      <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
-        [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']">筛选</button>
-      <button nz-button nzDanger acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()">导出</button>
+      <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+      <button nz-button nzDanger acl [acl-ability]="['ORDER-ABNORMAL-export']" (click)="exprot()">导出</button>
     </div>
   </div>
   <div>
-    <st #st [bordered]="true" [scroll]="{ x: '2000px' ,y:scrollY }" [data]="service.$api_get_abnormalWarning"
+    <st
+      #st
+      [bordered]="true"
+      [scroll]="{ x: '2000px', y: scrollY }"
+      [data]="service.$api_get_abnormalWarning"
       [columns]="columns"
       [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
       [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
-
-
+      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+      [loading]="false"
+    >
       <ng-template st-row="driverName" let-item let-index="index">
-        <div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }} </div>
+        <div> {{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }} </div>
       </ng-template>
       <ng-template st-row="longitude" let-item let-index="index">
-        <div> {{ item?.longitude }}
-          {{ item?.latitude ? "," + item?.latitude : '' }} </div>
+        <div> {{ item?.longitude }} {{ item?.latitude ? ',' + item?.latitude : '' }} </div>
       </ng-template>
       <ng-template st-row="billCode" let-item let-index="index">
         <!-- <a *ngIf="item.billType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
@@ -63,14 +65,11 @@
           <span>{{ item?.billStatusLabel }}</span>
         </div>
         <div>
-          <span>{{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ?
-            '':item?.serviceTypeLabel}}</span>
+          <span>{{ item?.billTypeLabel }}{{ item?.serviceTypeLabel === item?.billTypeLabel ? '' : item?.serviceTypeLabel }}</span>
         </div>
       </ng-template>
     </st>
   </div>
 </nz-card>
 
-<ng-template #extraTemplate>
-
-</ng-template>
+<ng-template #extraTemplate> </ng-template>

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

@@ -528,7 +528,7 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements
             text: '确认签收',
             click: _record => this.confirmReceipt(_record),
             iif: item => item.billStatus == '4',
-            acl: { ability: ['VEHICLE-LIST-view'] }
+            acl: { ability: ['ORDER-BULK-signBulkOrder'] }
           },
           {
             text: '取消订单',

src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-06 11:06:05
+ * @LastEditTime : 2022-04-29 10:29:12
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -118,7 +118,7 @@
   <div>
     <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
       [acl-ability]="['ORDER-RECEIPTS-search']">查询</button>
-    <button nz-button nzDanger [disabled]="false" (click)="exprot()">导出</button>
+    <button nz-button nzDanger [disabled]="false" (click)="exprot()" acl [acl-ability]="['ORDER-RECEIPTS-export']">导出</button>
     <button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
       更多<i nz-icon nzType="down" nzTheme="outline"></i></button>
     <nz-dropdown-menu #menu="nzDropdownMenu">

src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html

@@ -4,14 +4,14 @@
  * @Author       : Shiming
  * @Date         : 2021-12-29 14:51:07
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-08 13:21:35
+ * @LastEditTime : 2022-04-28 22:11:32
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <nz-alert nzType="info" [nzMessage]="'已选择'+ data?.ids?.length + '条订单'" nzShowIcon></nz-alert>
 <sf style="margin-top: 15px" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
 
-<st #st [data]="service.$api_searchAdditionalRateBatch" [columns]="columns"
+<st #st [data]="dataList" [columns]="columns"
 [req]="{ method: 'POST',params: reqParams}"
 [res]="{ reName: { list: 'data' } }"
 [page]="{show: false,showSize: false,front: false}"

src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts

@@ -1,10 +1,11 @@
+import { STComponent } from '@delon/abc/st';
 /*
  * @Description  : 
  * @Version      : 1.0
  * @Author       : Shiming
  * @Date         : 2021-12-29 14:51:07
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-08 13:21:59
+ * @LastEditTime : 2022-04-28 22:12:14
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -23,28 +24,30 @@ import { OrderManagementService } from '../../../services/order-management.servi
 })
 export class VehicleModifyRateComponent implements OnInit {
   @ViewChild('sf', { static: false }) sf!: SFComponent;
+  @ViewChild('st', { static: false }) st!: STComponent;
   schema: SFSchema = {};
   ui: SFUISchema = {};
   columns: STColumn[] = [
     { title: '订单号', index: 'billCode' },
     { title: '原附加费率', render: 'oldAdditionalRate' },
     { title: '原附加费', render: 'oldSurcharge' },
-    // { title: '新附加费', render: 'newSurcharge' },
+    { title: '新附加费', render: 'newSurcharge' },
   ];
   aggreechecked = false;
-
+  modiUrl: string= this.service.$api_searchAdditionalRateBatch
   @Input()
   data: any;
+  dataList: any;
 
   constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService) {}
 
   ngOnInit(): void {
     console.log(this.data);
     this.initSF();
+    this.initData();
     console.log(this.data?.ids)
   }
   get reqParams() {
-
     return { 
       // operateObject: this.i?.resourceCode,
       // operateType: 4,
@@ -52,6 +55,14 @@ export class VehicleModifyRateComponent implements OnInit {
       additionalRate: this.sf?.value?.additionalRate || 0
      };
   }
+  initData() {
+    console.log(this.reqParams);
+    
+    this.service.request(this.service.$api_searchAdditionalRateBatch, this.reqParams).subscribe((res: any) => {
+      console.log(res);
+      this.dataList = res
+    })
+  }
   initSF() {
     this.schema = {
       properties: {
@@ -63,7 +74,13 @@ export class VehicleModifyRateComponent implements OnInit {
           ui: {
             unit: '%',
             widgetWidth: 200,
-            precision: 2
+            precision: 2,
+            change:(item: any) => {
+              console.log(item);
+              setTimeout(() => {
+              this.initData() 
+              });
+            }
           } as SFNumberWidgetSchema
         }
       },

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

@@ -1,10 +1,10 @@
 /*
- * @Description  : 
+ * @Description  :
  * @Version      : 1.0
  * @Author       : Shiming
  * @Date         : 2022-01-06 09:24:00
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 09:43:47
+ * @LastEditTime : 2022-04-29 10:41:21
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\order-management-routing.module.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -25,22 +25,34 @@ import { OrderManagementVehicleDetailComponent } from './components/vehicle-deta
 import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component';
 
 const routes: Routes = [
-  { path: 'vehicle', component: OrderManagementVehicleComponent },
-  { path: 'vehicle/vehicle-detail/:id', component: OrderManagementVehicleDetailComponent },
+  { path: 'vehicle', component: OrderManagementVehicleComponent, data: { guard: { ability: ['ORDER-VEHICLE-search'] } } },
+  {
+    path: 'vehicle/vehicle-detail/:id',
+    component: OrderManagementVehicleDetailComponent,
+    data: { guard: { ability: ['ORDER-VEHICLE-DETAIL-search'] } }
+  },
   { path: 'vehicle-detailChange/:id', component: OrderManagementVehicleDetailChangeComponent },
-  { path: 'bulk', component: OrderManagementBulkComponent },
-  { path: 'bulk/bulk-detail/:id', component: OrderManagementBulkeDetailComponent },
+  { path: 'bulk', component: OrderManagementBulkComponent, data: { guard: { ability: ['ORDER-BULK-search'] } } },
+  {
+    path: 'bulk/bulk-detail/:id',
+    component: OrderManagementBulkeDetailComponent,
+    data: { guard: { ability: ['ORDER-BULK-DETAIL-search'] } }
+  },
   { path: 'bulk-detailChange/:id', component: OrderManagementBulkDetailChangeComponent },
-  { path: 'risk', component: OrderManagementRiskComponent },
+  { path: 'risk', component: OrderManagementRiskComponent, data: { guard: { ability: ['ORDER-RISK-search'] } } },
   { path: 'risk-detail/:id', component: OrderManagementRiskDetailComponent },
-  { path: 'complaint', component: OrderManagementComplaintComponent },
+  { path: 'complaint', component: OrderManagementComplaintComponent, data: { guard: { ability: ['ORDER-COMPLAINT-search'] } } },
   { path: 'complaint-detail/:id', component: OrderManagementComplaintDetailComponent },
-  { path: 'receipts-audit', component: OrderManagementReceiptsAuditComponent },
-  { path: 'compliance-audit', component: OrderManagementComplianceAuditComponent },
-  { path: 'abnormal-warning', component: OrderManagementAbnormalWarningComponent },
-]
+  { path: 'receipts-audit', component: OrderManagementReceiptsAuditComponent, data: { guard: { ability: ['ORDER-RECEIPTS-search'] } } },
+  {
+    path: 'compliance-audit',
+    component: OrderManagementComplianceAuditComponent,
+    data: { guard: { ability: ['ORDER-COMPLIANCE-AUDIT-search'] } }
+  },
+  { path: 'abnormal-warning', component: OrderManagementAbnormalWarningComponent, data: { guard: { ability: ['ORDER-ABNORMAL-search'] } } }
+];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
 })
-export class OrderManagementRoutingModule { }
+export class OrderManagementRoutingModule {}