diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html index 650f11fa..8816ed4d 100644 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html @@ -36,7 +36,7 @@
- +
diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts index 69227c4a..7c49fdab 100644 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts @@ -171,6 +171,7 @@ export class AbnormalGoldComponent extends BasicTableComponent implements OnInit buttons: [ { text: '查看', + acl: { ability: ['FINANCIAL-ABNORMAL-view'] }, click: item => this.router.navigate(['/financial-management/abnormal-gold/detail/' + item.id]) } ] diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts index 3c7c0268..eae0db6f 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts @@ -207,6 +207,7 @@ export class PlatformAccountComponent extends BasicTableComponent implements OnI { text: '提现', click: item => this.withdraw(item), + acl: { ability: ['FINANCIAL-PLATFORM-withdraw'] }, iif: _record => _record.bankType !== '1' }, // { @@ -216,6 +217,7 @@ export class PlatformAccountComponent extends BasicTableComponent implements OnI { text: '查看银行卡', click: item => this.viewBankcard(item), + acl: { ability: ['FINANCIAL-PLATFORM-viewBankcard'] }, iif: _record => _record.bankType !== '1' } ] diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html index 84e9be34..352e338e 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html @@ -25,7 +25,7 @@
- +
item.tradeType !== '9' && item.tradeType !== '10', + acl: { ability: ['FINANCIAL-TRANSACTION-receiptApply'] }, click: item => this.service.getReceiptUrl(item.receiptUrl, { bankType: item.bankType, diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index 8d9625a0..84337b23 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -251,10 +251,12 @@ export class WithdrawalsRecordComponent extends BasicTableComponent { { text: '审核', iif: item => item.refundStatus === '1', + acl: { ability: ['FINANCIAL-WITHDRAWALS-audit'] }, click: item => this.auditAction(item) }, { text: '详情
', + acl: { ability: ['FINANCIAL-WITHDRAWALS-view'] }, click: item => this.router.navigate([`/financial-management/withdrawals-record/detail/${item.id}`], { queryParams: { type: item.accountType } @@ -262,6 +264,7 @@ export class WithdrawalsRecordComponent extends BasicTableComponent { }, { text: '查看回单', + acl: { ability: ['FINANCIAL-WITHDRAWALS-receiptApply'] }, iif: item => item.refundStatus === '3', click: item => this.service.getReceiptUrl(item.receiptUrl, { 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 07e9f0d6..0d75969b 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -55,7 +55,7 @@ const routes: Routes = [ data: { guard: { ability: ['FINANCIAL-PLATFORM-DETAIL-detail'] } } }, { path: 'recharge-record', component: RechargeRecordComponent, data: { guard: { ability: ['FINANCIAL-RECHARGE-list'] } } }, - { path: 'withdrawals-record', component: WithdrawalsRecordComponent }, + { path: 'withdrawals-record', component: WithdrawalsRecordComponent, data: { guard: { ability: ['FINANCIAL-WITHDRAWALS-list'] } } }, { path: 'withdrawals-record/detail/:id', component: WithdrawalsDetailComponent }, { path: 'refund-record', component: RefundRecordComponent }, { path: 'voucher-management', component: VoucherManagementComponent, data: { guard: { ability: ['FINANCIAL-VOUCHER-list'] } } }, @@ -72,10 +72,10 @@ const routes: Routes = [ }, { path: 'cost-management/expenses-receivable/:id', component: ExpensesReceivableComponent }, { path: 'cost-management/expenses-payable/:id', component: ExpensesPayableComponent }, - { path: 'abnormal-gold', component: AbnormalGoldComponent }, + { path: 'abnormal-gold', component: AbnormalGoldComponent , data: { guard: { ability: ['FINANCIAL-ABNORMAL-list'] } } }, { path: 'abnormal-gold/detail/:id', component: AbnormalGoldDetailComponent }, { path: 'payment-record', component: PaymentRecordComponent }, - { path: 'transaction-flow', component: TransactionFlowComponent }, + { path: 'transaction-flow', component: TransactionFlowComponent , data: { guard: { ability: ['FINANCIAL-TRANSACTION-list'] } } }, { path: 'payment-order', component: PaymentOrderComponent, data: { guard: { ability: ['FINANCIAL-PAYMENT-ORDER-list'] } } }, { path: 'payment-order/detail/:id', component: PaymentOrderDetailComponent }, { path: 'receipt-order', component: ReceiptOrderComponent, data: { guard: { ability: ['FINANCIAL-RECEIPT-list'] } } }, diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts index 3fa501f9..c347a1be 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts @@ -392,6 +392,7 @@ export class CancellationInvoiceComponent implements OnInit { { type: 'divider' }, { text: '查看明细
', + acl: { ability: ['TICKET-CANCELLATION-view'] }, click: item => this.router.navigate(['ticket/cancellation-invoice/detail/' + item.id], { queryParams: { type: 1, expressno: item.expressno, ltdId: item.shipperId } @@ -399,11 +400,13 @@ export class CancellationInvoiceComponent implements OnInit { }, { text: '销货清单
', + acl: { ability: ['TICKET-CANCELLATION-downLoadDetail'] }, iif: item => item.isdetail, click: item => this.downLoadDetail(item) }, { text: '手工开票
', + acl: { ability: ['TICKET-CANCELLATION-apply'] }, iif: item => item.sts != '3' && item.sts != '4' , click: item => this.requestedAction(item) } diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html index 94d5cf5f..454341fe 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html +++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-09 17:07:02 + * @LastEditTime : 2022-04-29 14:34:09 * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\etc-blacklist\\etc-blacklist.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -28,17 +28,17 @@ >
- + - +
- - + +
已选择 {{ selectedRows.length }} 条数据 diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html index daaaf323..407dba23 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html @@ -1,3 +1,13 @@ + @@ -11,7 +21,7 @@
- + - + - + +
已选择 {{ selectedRows.length }} 条运单 diff --git a/src/app/routes/ticket-management/components/express-info/express-info.component.html b/src/app/routes/ticket-management/components/express-info/express-info.component.html index e19f3d85..ec192d9d 100644 --- a/src/app/routes/ticket-management/components/express-info/express-info.component.html +++ b/src/app/routes/ticket-management/components/express-info/express-info.component.html @@ -17,7 +17,7 @@
- +
diff --git a/src/app/routes/ticket-management/components/express-info/express-info.component.ts b/src/app/routes/ticket-management/components/express-info/express-info.component.ts index c5d9659a..1cbf2974 100644 --- a/src/app/routes/ticket-management/components/express-info/express-info.component.ts +++ b/src/app/routes/ticket-management/components/express-info/express-info.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-04-28 20:27:22 + * @LastEditors : Shiming + * @LastEditTime : 2022-04-29 14:14:59 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\express-info\\express-info.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, OnInit, ViewChild } from '@angular/core'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form'; @@ -49,6 +59,7 @@ export class ExpressInfoComponent implements OnInit { width: 120, type: 'link', click: (record: any) => this.showDetail(record.expressCode), + acl: { ability: ['TICKET-EXPRESS-INFO-expressInvoices'] }, className: 'text-right' }, { title: '寄件人姓名', index: 'sname', width: 150 }, diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html index 5c6ac9d3..d016b77f 100644 --- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.html @@ -12,7 +12,7 @@ [class.expend-options]="_$expand"> - + +
已选择 {{ selectedRows.length }} 张发票 diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts index 5dc512c0..54322cb9 100644 --- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts @@ -256,10 +256,12 @@ export class InputInvoiceComponent implements OnInit { buttons: [ { text: '浏览', + acl: { ability: ['TICKET-INPUT-INVOICE-view'] }, click: item => this.router.navigate(['/ticket/input-invoice/detail/' + item.id]) }, { text: '修改', + acl: { ability: ['TICKET-INPUT-INVOICE-edit'] }, click: item => this.router.navigate(['/ticket/input-invoice/edit/1']) } ] diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html index 8b2f989e..f88880f2 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-21 15:39:30 * @LastEditors : Shiming - * @LastEditTime : 2022-01-26 09:36:07 + * @LastEditTime : 2022-04-29 13:55:16 * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\invoice-requested.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -20,7 +20,7 @@
- +
- + + (click)="this.rejectAction(selectedRows)" acl [acl-ability]="['TICKET-INVOICE-REQUESTED-reject']">驳回 - + (click)="changeAddress(selectedRows)" acl [acl-ability]="['VEHICLE-LIST-search']">修改地址 +
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index ca3afe4d..cce37763 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -513,25 +513,30 @@ export class InvoiceRequestedComponent { { text: '开票受理
', click: item => this.requestedInvoiceAction(item), + acl: { ability: ['TICKET-INVOICE-REQUESTED-requestedInvoiceAction'] }, iif: item => item.sts === '1' }, { text: '驳回申请
', click: item => this.rejectAction([item]), + acl: { ability: ['TICKET-INVOICE-REQUESTED-rejectAction'] }, iif: item => item.sts === '1' }, { text: '订单明细
', + acl: { ability: ['TICKET-INVOICE-REQUESTED-detail'] }, click: item => this.router.navigate([`/ticket/invoice-requested/detail/${item?.id}`], { queryParams: { sts: item.sts } }) }, { text: '查看原因
', click: item => this.showReason(item), + acl: { ability: ['TICKET-INVOICE-REQUESTED-viewResult'] }, iif: item => item.sts === '4' }, { text: '下载对账单', iif: item => item.sts === '3', + acl: { ability: ['TICKET-INVOICE-REQUESTED-downloadPDF'] }, click: item => this.downloadPdf(item) } ] diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts index e818fdd1..dd85d9da 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts @@ -347,6 +347,7 @@ export class InvoicedListComponent implements OnInit { { type: 'divider' }, { text: '查看明细
', + acl: { ability: ['TICKET-INVOICE-LIST-view'] }, click: item => this.router.navigate(['/ticket/invoice-list/detail/' + item.id], { queryParams: { expressno: item.expressno, type: 2, ltdId: item.shipperId } @@ -354,26 +355,31 @@ export class InvoicedListComponent implements OnInit { }, { text: '取消开票
', + acl: { ability: ['TICKET-INVOICE-LIST-canceInvoice'] }, click: item => this.canceInvoice(item), iif: item => item.sts === '1' }, { text: '发票作废
', + acl: { ability: ['TICKET-INVOICE-LIST-deletedInvoice'] }, click: item => this.deletedInvoice(item), iif: item => item.sts === '3' }, { text: '查看物流
', + acl: { ability: ['TICKET-INVOICE-LIST-showExpress'] }, click: item => this.showlogosticsLogs(item), iif: item => item.expresscompany }, { text: '填写物流
', + acl: { ability: ['TICKET-INVOICE-LIST-writeExpress'] }, click: item => this.requestedAction(item), iif: item => !item.expresscompany }, { text: '修改物流
', + acl: { ability: ['TICKET-INVOICE-LIST-updateExpress'] }, click: item => this.requestedAction(item), iif: item => item.expresscompany } diff --git a/src/app/routes/ticket-management/ticket-management-routing.module.ts b/src/app/routes/ticket-management/ticket-management-routing.module.ts index 51369dec..fa616e5c 100644 --- a/src/app/routes/ticket-management/ticket-management-routing.module.ts +++ b/src/app/routes/ticket-management/ticket-management-routing.module.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-04-28 20:27:08 + * @LastEditors : Shiming + * @LastEditTime : 2022-04-29 14:40:29 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\ticket-management-routing.module.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { BillingOrderComponent } from './components/billing-order/billing-order.component'; @@ -16,21 +26,21 @@ import { InvoiceRequestedComponent } from './components/invoice-requested/invoic import { InvoicedListComponent } from './components/invoiced-list/invoiced-list.component'; const routes: Routes = [ - { path: 'invoice-requested', component: InvoiceRequestedComponent }, + { path: 'invoice-requested', component: InvoiceRequestedComponent, data: { guard: { ability: ['TICKET-INVOICE-REQUESTED-list'] } } }, { path: 'invoice-requested/detail/:id', component: InvoiceRequestedDetailComponent }, - { path: 'invoice-list', component: InvoicedListComponent }, + { path: 'invoice-list', component: InvoicedListComponent , data: { guard: { ability: ['TICKET-INVOICE-LIST-list'] } }}, { path: 'invoice-list/detail/:id', component: InvoiceDetailComponent }, - { path: 'cancellation-invoice', component: CancellationInvoiceComponent }, + { path: 'cancellation-invoice', component: CancellationInvoiceComponent , data: { guard: { ability: ['TICKET-CANCELLATION-list'] } }}, { path: 'cancellation-invoice/detail/:id', component: InvoiceDetailComponent }, - { path: 'etc-invoice-requested', component: ETCInvoicedRequestedComponent }, - { path: 'etc-invoice-list', component: ETCInvoicedListComponent }, - { path: 'etc-invoiced-logs', component: ETCInvoicedLogsComponent }, - { path: 'etc-blacklist', component: ETCBlacklistComponent }, - { path: 'input-invoice', component: InputInvoiceComponent }, + { path: 'etc-invoice-requested', component: ETCInvoicedRequestedComponent , data: { guard: { ability: ['TICKET-ETC-INVOICE-REQUESTED-list'] } } }, + { path: 'etc-invoice-list', component: ETCInvoicedListComponent, data: { guard: { ability: ['TICKET-ETC-INVOICE-LIST-list'] } } }, + { path: 'etc-invoiced-logs', component: ETCInvoicedLogsComponent , data: { guard: { ability: ['TICKET-ETC-INVOICE-LOGS-list'] } }}, + { path: 'etc-blacklist', component: ETCBlacklistComponent , data: { guard: { ability: ['TICKET-ETC-BLACK_LIST-freightList'] } }}, + { path: 'input-invoice', component: InputInvoiceComponent , data: { guard: { ability: ['TICKET-INPUT-INVOICE-list'] } }}, { path: 'input-invoice/detail/:id', component: InputInvoiceDetailComponent }, { path: 'input-invoice/edit/:id', component: EditCollectionInvoiceComponent }, - { path: 'express-info', component: ExpressInfoComponent }, - { path: 'billing-order', component: BillingOrderComponent } + { path: 'express-info', component: ExpressInfoComponent , data: { guard: { ability: ['TICKET-EXPRESS-INFO-list'] } }}, + { path: 'billing-order', component: BillingOrderComponent, data: { guard: { ability: ['TICKET-BILLING-ORDER-search'] } } } ]; @NgModule({