From 507d8660d65be1bc16500aaa451d6addd140e405 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 17:22:25 +0800 Subject: [PATCH 1/7] 1.2.0 --- .../components/list/list.component.html | 54 ++++++++----------- .../routes/vehicle/vehicle-routing.module.ts | 12 +++-- 2 files changed, 30 insertions(+), 36 deletions(-) diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html index e2e98417..7c2dbd77 100644 --- a/src/app/routes/vehicle/components/list/list.component.html +++ b/src/app/routes/vehicle/components/list/list.component.html @@ -16,17 +16,10 @@
- - + + - + + +
this.roleAction(item, 2) }, { text: '删除', + acl: { ability: ['SYSTEM-ANNOUNCEMENT-delete'] }, click: item => this.deleteAction(item) }, ] diff --git a/src/app/routes/sys-setting/sys-setting-routing.module.ts b/src/app/routes/sys-setting/sys-setting-routing.module.ts index 17f14f29..fb77019d 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -54,7 +54,7 @@ const routes: Routes = [ { path: 'network-freight/new/:id', component: NetworkFreightNewComponent }, { path: 'close-account', component: CloseAccountComponent }, // { path: 'btn-management', component: BtnManagementComponent }, - { path: 'announcement-message', component: AnnouncementMessageComponent }, + { path: 'announcement-message', component: AnnouncementMessageComponent, data: { guard: { ability: ['SYSTEM-ANNOUNCEMENT-list'] } } }, { path: 'insurance-set', component: InsuranceSetComponent }, { path: 'sms-template', component: SmsTemplateComponent, data: { guard: { ability: ['SMS_TEMPLATE-search'] } } } ]; From 6047fde637812989225f34c124b157dca47c918e Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 17:30:08 +0800 Subject: [PATCH 3/7] 8026 --- .../recharge-record/recharge-record.component.html | 3 ++- .../recharge-record/recharge-record.component.ts | 8 +++++--- .../financial-managemen-routing.module.ts | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html index d0ed4c80..8f33ae3e 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html @@ -40,7 +40,8 @@
- +
', + acl: { ability: ['FINANCIAL-RECHARGE-receiptApply'] }, click: item => this.service.getReceiptUrl(item.receiptUrl, { bankType: item.bankType, @@ -207,6 +208,7 @@ export class RechargeRecordComponent extends BasicTableComponent implements OnIn }, { text: '添加备注', + acl: { ability: ['FINANCIAL-RECHARGE-addRemark'] }, click: item => this.addRemark(item) } ] diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index aa5ba856..f82dc133 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -50,7 +50,7 @@ const routes: Routes = [ component: PlatformAccountDetailComponent, data: { guard: { ability: ['FINANCIAL-PLATFORM-DETAIL-detail'] } } }, - { path: 'recharge-record', component: RechargeRecordComponent }, + { path: 'recharge-record', component: RechargeRecordComponent, data: { guard: { ability: ['FINANCIAL-RECHARGE-list'] } } }, { path: 'withdrawals-record', component: WithdrawalsRecordComponent }, { path: 'withdrawals-record/detail/:id', component: WithdrawalsDetailComponent }, { path: 'refund-record', component: RefundRecordComponent }, From 7355907be3d24d57074d4e3f25ffa58e0fdece6c Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 17:31:39 +0800 Subject: [PATCH 4/7] 8021 --- .../components/payable-order/payable-order.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts index f5fac6ee..860a4753 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts @@ -273,6 +273,7 @@ export class PayableOrderComponent implements OnInit { buttons: [ { text: '浏览', + acl: { ability: ['FINANCIAL-PAYABLE-view'] }, click: item => this.router.navigate(['/financial-management/payable-order/detail/' + item.id], { queryParams: { billHId: item.id } }) } From d83eabaf09e5df3a9f432bb09ce23aedcb0c5a98 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 17:41:17 +0800 Subject: [PATCH 5/7] fix bug --- .../assigned-car/assigned-car.component.html | 26 +++++++++++++++---- .../choose-famifiar.component.html | 8 ++++-- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html index 22030b03..8888f432 100644 --- a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html +++ b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html @@ -1,4 +1,17 @@ + + +
+
-
- - -
+
+ + +
+ + +
\ No newline at end of file diff --git a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html index 0f517765..2f8b7ad1 100644 --- a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html +++ b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html @@ -4,12 +4,13 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 14:27:20 + * @LastEditTime : 2022-04-28 17:36:31 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\choose-famifiar\\choose-famifiar.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> +
@@ -19,6 +20,7 @@
+
@@ -55,7 +57,9 @@
+ +
-
+
\ No newline at end of file From a65aa4e50ad7abbeeec7151aa731e8e3ac6c603b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 17:45:04 +0800 Subject: [PATCH 6/7] 8023 7983 --- .../financial-management/financial-managemen-routing.module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index f82dc133..00db0eb7 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -54,7 +54,7 @@ const routes: Routes = [ { path: 'withdrawals-record', component: WithdrawalsRecordComponent }, { path: 'withdrawals-record/detail/:id', component: WithdrawalsDetailComponent }, { path: 'refund-record', component: RefundRecordComponent }, - { path: 'voucher-management', component: VoucherManagementComponent }, + { path: 'voucher-management', component: VoucherManagementComponent, data: { guard: { ability: ['FINANCIAL-VOUCHER-list'] } } }, { path: 'voucher-management/detail/:id', component: VoucherDetailComponent }, { path: 'voucher-summary', component: VoucherSummaryComponent, data: { guard: { ability: ['FINANCIAL-VOUCHER-SUMMARY-list'] } } }, { path: 'voucher-summary/detail/:id', component: SummaryDetailComponent }, From 60c5d155648b19ca535c7e9745b6d37975126eba Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 18:57:49 +0800 Subject: [PATCH 7/7] edit --- .../tax-management-routing.module.ts | 20 ++++++++++--------- .../usercenter/usercenter-routing.module.ts | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/app/routes/tax-management/tax-management-routing.module.ts b/src/app/routes/tax-management/tax-management-routing.module.ts index ce7b3f5f..01f84120 100644 --- a/src/app/routes/tax-management/tax-management-routing.module.ts +++ b/src/app/routes/tax-management/tax-management-routing.module.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-03-30 13:58:28 @@ -16,18 +16,20 @@ import { TaxManagementIndividualIncomeComponent } from './components/individual- import { TaxManagementInvoiceReportingComponent } from './components/invoice-reporting/invoice-reporting.component'; import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component'; - const routes: Routes = [ - { path: 'orderReport', component: TaxManagementOrderReportingComponent }, - { path: 'income', component: TaxManagementIndividualIncomeComponent }, - { path: 'collect', component: TaxManagementIndividualCollectComponent }, - { path: 'declare', component: TaxManagementIndividualDeclareComponent }, - { path: 'invoiceReport', component: TaxManagementInvoiceReportingComponent }, + { path: 'orderReport', component: TaxManagementOrderReportingComponent, data: { guard: { ability: ['TAX-ORDERREPORT-search'] } } }, + { path: 'income', component: TaxManagementIndividualIncomeComponent, data: { guard: { ability: ['TAX-INCOME-search'] } } }, + { path: 'collect', component: TaxManagementIndividualCollectComponent, data: { guard: { ability: ['TAX-COLLECT-search'] } } }, + { path: 'declare', component: TaxManagementIndividualDeclareComponent, data: { guard: { ability: ['TAX-DECLARE-search'] } } }, + { + path: 'invoiceReport', + component: TaxManagementInvoiceReportingComponent, + data: { guard: { ability: ['TAX_INVOICE_REPORT-list'] } } + } ]; - @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class TaxManagementModuleRoutingModule { } +export class TaxManagementModuleRoutingModule {} diff --git a/src/app/routes/usercenter/usercenter-routing.module.ts b/src/app/routes/usercenter/usercenter-routing.module.ts index 3034830b..5cbf597a 100644 --- a/src/app/routes/usercenter/usercenter-routing.module.ts +++ b/src/app/routes/usercenter/usercenter-routing.module.ts @@ -71,7 +71,7 @@ const routes: Routes = [ { path: 'driver/config', component: UserCenterComponentsDriverConfigComponent, - data: { guard: { ability: ['USERCENTER-DRIVER-CAPTAIN-list'] } } + data: { guard: { ability: ['USERCENTER-DRIVER-CONFIG-search'] } } } ];