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

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

@@ -1,3 +1,13 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-21 13:49:21
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-29 15:25:49
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\logs\\logs-routing.module.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { SystemLogsComponent } from './components/system-logs/system-logs.component';
@@ -7,11 +17,11 @@ import { UserLogsComponent } from './components/user-logs/user-logs.component';
 import { VersionLogsComponent } from './components/version-logs/version-logs.component';
 
 const routes: Routes = [
-  { path: 'system-logs', component: SystemLogsComponent },
+  { path: 'system-logs', component: SystemLogsComponent, data: { guard: { ability: ['LOGS-LOGS-list'] } } },
-  { path: 'user-logs', component: UserLogsComponent },
+  { path: 'user-logs', component: UserLogsComponent, data: { guard: { ability: ['LOGS-USER-LOGS-list'] } } },
-  { path: 'version-logs', component: VersionLogsComponent },
+  { path: 'version-logs', component: VersionLogsComponent , data: { guard: { ability: ['LOGS-VERSION-LOGS-list'] } }},
-  { path: 'system-supply-logs', component: SystemSupplyLogsComponent },
+  { path: 'system-supply-logs', component: SystemSupplyLogsComponent , data: { guard: { ability: ['LOGS-SUPPLY-LOGS-list'] } }},
-  { path: 'system-waybill-logs', component: SystemWaybillLogsComponent }
+  { path: 'system-waybill-logs', component: SystemWaybillLogsComponent , data: { guard: { ability: ['LOGS-WAYBILL-LOGS-list'] } }}
 ];
 
 @NgModule({

src/app/routes/partner/partner.module.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-09 14:34:55
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-27 11:28:31
+ * @LastEditTime : 2022-04-29 15:29:58
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\partner.module.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-13 19:22:47
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-30 14:09:00
+ * @LastEditTime : 2022-04-29 15:26:30
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\routes-routing.module.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -42,7 +42,6 @@ const routes: Routes = [
       { path: 'system', loadChildren: () => import('./sys-setting/sys-setting.module').then(m => m.SysSettingModule) },
       { path: 'logs', loadChildren: () => import('./logs/logs.module').then(m => m.LogsModule) },
       { path: 'ticket', loadChildren: () => import('./ticket-management/ticket-management.module').then(m => m.TicketManagementModule) },
-      { path: 'supplygoods', loadChildren: () => import('./supply-goods/supply-goods.module').then(m => m.SupplyGoodsModule) },
       { path: 'vehicle', loadChildren: () => import('./vehicle/vehicle.module').then(m => m.VehicleModule) },
       {
         path: 'supply-management',

src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html

@@ -13,8 +13,7 @@
 </nz-card>
 
 <nz-card>
-  <div class="card-title"x
+  <div class="card-title">装卸货信息<span class="tip-font">预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时</span></div
-    >装卸货信息<span class="tip-font">预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时</span></div
   >
 
   <form #ngForm="ngForm" nz-form role="form">

src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts

@@ -445,10 +445,11 @@ export class TaxManagementOrderReportingComponent implements OnInit {
       this.service.msgSrv.warning('选择了已上传，请重新勾选！');
       return;
     }
-    if(this.selectedRows.find(item => item.checkStatus !== '1')) {
+    
-      this.service.msgSrv.warning('选择了未通过校验的订单，请重新勾选！');
+    // if(this.selectedRows.find(item => item.checkStatus !== 1)) {
-      return;
+    //   this.service.msgSrv.warning('选择了未通过校验的订单，请重新勾选！');
-    }
+    //   return;
+    // }
     let params: any[] = [];
     this.selectedRows.forEach(item => {
       params.push(item.id);