From db919672e04a7d31fe212e829118fa983cfcd382 Mon Sep 17 00:00:00 2001 From: weiyu Date: Fri, 29 Apr 2022 15:20:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bulk-release-publish.component.html | 3 +-- .../order-reporting/order-reporting.component.ts | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html index db754dcf..20624310 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html @@ -13,8 +13,7 @@ -
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 67b57200..1ff984b0 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -445,10 +445,10 @@ export class TaxManagementOrderReportingComponent implements OnInit { this.service.msgSrv.warning('选择了已上传，请重新勾选！'); return; } - if(this.selectedRows.find(item => item.checkStatus !== '1')) { - this.service.msgSrv.warning('选择了未通过校验的订单，请重新勾选！'); - return; - } + // if(this.selectedRows.find(item => item.checkStatus !== '1')) { + // this.service.msgSrv.warning('选择了未通过校验的订单，请重新勾选！'); + // return; + // } let params: any[] = []; this.selectedRows.forEach(item => { params.push(item.id); From d9a2130ff0ab8823857161a476320f37786dc223 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 29 Apr 2022 15:26:49 +0800 Subject: [PATCH 2/4] fix bug --- src/app/routes/logs/logs-routing.module.ts | 20 +++++++++++++++----- src/app/routes/routes-routing.module.ts | 3 +-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/app/routes/logs/logs-routing.module.ts b/src/app/routes/logs/logs-routing.module.ts index 40e2ccb5..be39ab3f 100644 --- a/src/app/routes/logs/logs-routing.module.ts +++ b/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: 'user-logs', component: UserLogsComponent }, - { path: 'version-logs', component: VersionLogsComponent }, - { path: 'system-supply-logs', component: SystemSupplyLogsComponent }, - { path: 'system-waybill-logs', component: SystemWaybillLogsComponent } + { path: 'system-logs', component: SystemLogsComponent, data: { guard: { ability: ['LOGS-LOGS-list'] } } }, + { path: 'user-logs', component: UserLogsComponent, data: { guard: { ability: ['LOGS-USER-LOGS-list'] } } }, + { path: 'version-logs', component: VersionLogsComponent , data: { guard: { ability: ['LOGS-VERSION-LOGS-list'] } }}, + { path: 'system-supply-logs', component: SystemSupplyLogsComponent , data: { guard: { ability: ['LOGS-SUPPLY-LOGS-list'] } }}, + { path: 'system-waybill-logs', component: SystemWaybillLogsComponent , data: { guard: { ability: ['LOGS-WAYBILL-LOGS-list'] } }} ]; @NgModule({ diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts index 205ce968..ac82cbfc 100644 --- a/src/app/routes/routes-routing.module.ts +++ b/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', From 2fbfc7481107eaa50bb36e432444e45572a1f83a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 29 Apr 2022 15:31:08 +0800 Subject: [PATCH 3/4] fix bug --- src/app/routes/partner/partner.module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts index d73c4b94..66729798 100644 --- a/src/app/routes/partner/partner.module.ts +++ b/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. */ From 594f3bb5d3097f3be6e970bb1094e48f78af2242 Mon Sep 17 00:00:00 2001 From: weiyu Date: Fri, 29 Apr 2022 15:37:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/order-reporting/order-reporting.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 1ff984b0..53e0f9f0 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -445,7 +445,8 @@ export class TaxManagementOrderReportingComponent implements OnInit { this.service.msgSrv.warning('选择了已上传，请重新勾选！'); return; } - // if(this.selectedRows.find(item => item.checkStatus !== '1')) { + + // if(this.selectedRows.find(item => item.checkStatus !== 1)) { // this.service.msgSrv.warning('选择了未通过校验的订单，请重新勾选！'); // return; // }