Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
@ -36,7 +36,7 @@
|
|||||||
<ng-template #extraTemplate>
|
<ng-template #extraTemplate>
|
||||||
<div class="mr-sm">
|
<div class="mr-sm">
|
||||||
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
|
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
|
||||||
<button nz-button nzDanger (click)="exprot()"> 导出</button>
|
<button nz-button nzDanger (click)="exprot()" acl [acl-ability]="['FINANCIAL-ABNORMAL-export']"> 导出</button>
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|
||||||
|
|||||||
@ -171,6 +171,7 @@ export class AbnormalGoldComponent extends BasicTableComponent implements OnInit
|
|||||||
buttons: [
|
buttons: [
|
||||||
{
|
{
|
||||||
text: '查看',
|
text: '查看',
|
||||||
|
acl: { ability: ['FINANCIAL-ABNORMAL-view'] },
|
||||||
click: item => this.router.navigate(['/financial-management/abnormal-gold/detail/' + item.id])
|
click: item => this.router.navigate(['/financial-management/abnormal-gold/detail/' + item.id])
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@ -207,6 +207,7 @@ export class PlatformAccountComponent extends BasicTableComponent implements OnI
|
|||||||
{
|
{
|
||||||
text: '提现',
|
text: '提现',
|
||||||
click: item => this.withdraw(item),
|
click: item => this.withdraw(item),
|
||||||
|
acl: { ability: ['FINANCIAL-PLATFORM-withdraw'] },
|
||||||
iif: _record => _record.bankType !== '1'
|
iif: _record => _record.bankType !== '1'
|
||||||
},
|
},
|
||||||
// {
|
// {
|
||||||
@ -216,6 +217,7 @@ export class PlatformAccountComponent extends BasicTableComponent implements OnI
|
|||||||
{
|
{
|
||||||
text: '查看银行卡',
|
text: '查看银行卡',
|
||||||
click: item => this.viewBankcard(item),
|
click: item => this.viewBankcard(item),
|
||||||
|
acl: { ability: ['FINANCIAL-PLATFORM-viewBankcard'] },
|
||||||
iif: _record => _record.bankType !== '1'
|
iif: _record => _record.bankType !== '1'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@ -25,7 +25,7 @@
|
|||||||
<label class="page_title"> <label class="driver">|</label> 交易流水</label>
|
<label class="page_title"> <label class="driver">|</label> 交易流水</label>
|
||||||
<div class="mr-sm">
|
<div class="mr-sm">
|
||||||
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
|
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
|
||||||
<button nz-button nzDanger (click)="exportList()"> 导出</button>
|
<button nz-button nzDanger (click)="exportList()" acl [acl-ability]="['FINANCIAL-TRANSACTION-export']"> 导出</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<st #st [data]="service.$api_get_account_blance" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
|
<st #st [data]="service.$api_get_account_blance" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
|
||||||
|
|||||||
@ -210,6 +210,7 @@ export class TransactionFlowComponent extends BasicTableComponent {
|
|||||||
{
|
{
|
||||||
text: '查看回单',
|
text: '查看回单',
|
||||||
iif: item => item.tradeType !== '9' && item.tradeType !== '10',
|
iif: item => item.tradeType !== '9' && item.tradeType !== '10',
|
||||||
|
acl: { ability: ['FINANCIAL-TRANSACTION-receiptApply'] },
|
||||||
click: item =>
|
click: item =>
|
||||||
this.service.getReceiptUrl(item.receiptUrl, {
|
this.service.getReceiptUrl(item.receiptUrl, {
|
||||||
bankType: item.bankType,
|
bankType: item.bankType,
|
||||||
|
|||||||
@ -251,10 +251,12 @@ export class WithdrawalsRecordComponent extends BasicTableComponent {
|
|||||||
{
|
{
|
||||||
text: '审核',
|
text: '审核',
|
||||||
iif: item => item.refundStatus === '1',
|
iif: item => item.refundStatus === '1',
|
||||||
|
acl: { ability: ['FINANCIAL-WITHDRAWALS-audit'] },
|
||||||
click: item => this.auditAction(item)
|
click: item => this.auditAction(item)
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '详情<br>',
|
text: '详情<br>',
|
||||||
|
acl: { ability: ['FINANCIAL-WITHDRAWALS-view'] },
|
||||||
click: item =>
|
click: item =>
|
||||||
this.router.navigate([`/financial-management/withdrawals-record/detail/${item.id}`], {
|
this.router.navigate([`/financial-management/withdrawals-record/detail/${item.id}`], {
|
||||||
queryParams: { type: item.accountType }
|
queryParams: { type: item.accountType }
|
||||||
@ -262,6 +264,7 @@ export class WithdrawalsRecordComponent extends BasicTableComponent {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '查看回单',
|
text: '查看回单',
|
||||||
|
acl: { ability: ['FINANCIAL-WITHDRAWALS-receiptApply'] },
|
||||||
iif: item => item.refundStatus === '3',
|
iif: item => item.refundStatus === '3',
|
||||||
click: item =>
|
click: item =>
|
||||||
this.service.getReceiptUrl(item.receiptUrl, {
|
this.service.getReceiptUrl(item.receiptUrl, {
|
||||||
|
|||||||
@ -55,7 +55,7 @@ const routes: Routes = [
|
|||||||
data: { guard: { ability: ['FINANCIAL-PLATFORM-DETAIL-detail'] } }
|
data: { guard: { ability: ['FINANCIAL-PLATFORM-DETAIL-detail'] } }
|
||||||
},
|
},
|
||||||
{ path: 'recharge-record', component: RechargeRecordComponent, data: { guard: { ability: ['FINANCIAL-RECHARGE-list'] } } },
|
{ 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: 'withdrawals-record/detail/:id', component: WithdrawalsDetailComponent },
|
||||||
{ path: 'refund-record', component: RefundRecordComponent },
|
{ path: 'refund-record', component: RefundRecordComponent },
|
||||||
{ path: 'voucher-management', component: VoucherManagementComponent, data: { guard: { ability: ['FINANCIAL-VOUCHER-list'] } } },
|
{ 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-receivable/:id', component: ExpensesReceivableComponent },
|
||||||
{ path: 'cost-management/expenses-payable/:id', component: ExpensesPayableComponent },
|
{ 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: 'abnormal-gold/detail/:id', component: AbnormalGoldDetailComponent },
|
||||||
{ path: 'payment-record', component: PaymentRecordComponent },
|
{ 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', component: PaymentOrderComponent, data: { guard: { ability: ['FINANCIAL-PAYMENT-ORDER-list'] } } },
|
||||||
{ path: 'payment-order/detail/:id', component: PaymentOrderDetailComponent },
|
{ path: 'payment-order/detail/:id', component: PaymentOrderDetailComponent },
|
||||||
{ path: 'receipt-order', component: ReceiptOrderComponent, data: { guard: { ability: ['FINANCIAL-RECEIPT-list'] } } },
|
{ path: 'receipt-order', component: ReceiptOrderComponent, data: { guard: { ability: ['FINANCIAL-RECEIPT-list'] } } },
|
||||||
|
|||||||
@ -392,6 +392,7 @@ export class CancellationInvoiceComponent implements OnInit {
|
|||||||
{ type: 'divider' },
|
{ type: 'divider' },
|
||||||
{
|
{
|
||||||
text: '查看明细<br>',
|
text: '查看明细<br>',
|
||||||
|
acl: { ability: ['TICKET-CANCELLATION-view'] },
|
||||||
click: item =>
|
click: item =>
|
||||||
this.router.navigate(['ticket/cancellation-invoice/detail/' + item.id], {
|
this.router.navigate(['ticket/cancellation-invoice/detail/' + item.id], {
|
||||||
queryParams: { type: 1, expressno: item.expressno, ltdId: item.shipperId }
|
queryParams: { type: 1, expressno: item.expressno, ltdId: item.shipperId }
|
||||||
@ -399,11 +400,13 @@ export class CancellationInvoiceComponent implements OnInit {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '销货清单<br>',
|
text: '销货清单<br>',
|
||||||
|
acl: { ability: ['TICKET-CANCELLATION-downLoadDetail'] },
|
||||||
iif: item => item.isdetail,
|
iif: item => item.isdetail,
|
||||||
click: item => this.downLoadDetail(item)
|
click: item => this.downLoadDetail(item)
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '手工开票<br>',
|
text: '手工开票<br>',
|
||||||
|
acl: { ability: ['TICKET-CANCELLATION-apply'] },
|
||||||
iif: item => item.sts != '3' && item.sts != '4' ,
|
iif: item => item.sts != '3' && item.sts != '4' ,
|
||||||
click: item => this.requestedAction(item)
|
click: item => this.requestedAction(item)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2022-04-06 10:57:56
|
* @Date : 2022-04-06 10:57:56
|
||||||
* @LastEditors : Shiming
|
* @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
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\etc-blacklist\\etc-blacklist.component.html
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
-->
|
-->
|
||||||
@ -28,17 +28,17 @@
|
|||||||
></sf>
|
></sf>
|
||||||
</div>
|
</div>
|
||||||
<div nz-col [nzXl]="6" [nzLg]="24" [nzMd]="24" [nzSm]="24" [nzXs]="24" class="text-right">
|
<div nz-col [nzXl]="6" [nzLg]="24" [nzMd]="24" [nzSm]="24" [nzXs]="24" class="text-right">
|
||||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
|
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="[tabType === 1 ?'TICKET-ETC-BLACK_LIST-freightList' : 'TICKET-ETC-BLACK_LIST-cartList']">查询</button>
|
||||||
<button nz-button (click)="resetSF()">重置</button>
|
<button nz-button (click)="resetSF()">重置</button>
|
||||||
<button nz-button (click)="exprot()"> 导出</button>
|
<button nz-button (click)="exprot()" acl [acl-ability]="[tabType === 1 ?'TICKET-ETC-BLACK_LIST-exportFreight' : 'TICKET-ETC-BLACK_LIST-exportCart']"> 导出</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</nz-card>
|
</nz-card>
|
||||||
|
|
||||||
<nz-card>
|
<nz-card>
|
||||||
<div class="d-flex align-items-center mb-md">
|
<div class="d-flex align-items-center mb-md">
|
||||||
<button nz-button (click)="configAction()">添加</button>
|
<button nz-button (click)="configAction()" acl [acl-ability]="[tabType === 1 ? 'TICKET-ETC-BLACK_LIST-addFreight' : 'TICKET-ETC-BLACK_LIST-addCart']">添加</button>
|
||||||
<button nz-button (click)="deleteAction()">删除</button>
|
<button nz-button (click)="deleteAction()" acl [acl-ability]="[tabType === 1 ? 'TICKET-ETC-BLACK_LIST-deleteFreight' : 'TICKET-ETC-BLACK_LIST-deleteCart']">删除</button>
|
||||||
<div class="ml-md">
|
<div class="ml-md">
|
||||||
已选择
|
已选择
|
||||||
<strong class="text-primary">{{ selectedRows.length }}</strong> 条数据
|
<strong class="text-primary">{{ selectedRows.length }}</strong> 条数据
|
||||||
|
|||||||
@ -1,3 +1,13 @@
|
|||||||
|
<!--
|
||||||
|
* @Description :
|
||||||
|
* @Version : 1.0
|
||||||
|
* @Author : Shiming
|
||||||
|
* @Date : 2022-04-28 20:27:08
|
||||||
|
* @LastEditors : Shiming
|
||||||
|
* @LastEditTime : 2022-04-29 14:19:10
|
||||||
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\etc-invoiced-list\\etc-invoiced-list.component.html
|
||||||
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
|
-->
|
||||||
<page-header-wrapper [title]="'运单开票记录'">
|
<page-header-wrapper [title]="'运单开票记录'">
|
||||||
</page-header-wrapper>
|
</page-header-wrapper>
|
||||||
|
|
||||||
@ -11,7 +21,7 @@
|
|||||||
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
|
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
|
||||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
|
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
|
||||||
<button nz-button (click)="resetSF()">重置</button>
|
<button nz-button (click)="resetSF()">重置</button>
|
||||||
<button nz-button (click)="exprot()"> 导出</button>
|
<button nz-button (click)="exprot()" acl [acl-ability]="['TICKET-ETC-INVOICE-LIST-export']"> 导出</button>
|
||||||
<button nz-button nzType="link" (click)="expandToggle()">
|
<button nz-button nzType="link" (click)="expandToggle()">
|
||||||
{{ !_$expand ? '展开' : '收起' }}
|
{{ !_$expand ? '展开' : '收起' }}
|
||||||
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
|
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
|
||||||
|
|||||||
@ -182,10 +182,12 @@ export class ETCInvoicedListComponent implements OnInit {
|
|||||||
{
|
{
|
||||||
title: '操作',
|
title: '操作',
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
|
fixed: 'right',
|
||||||
width: 120,
|
width: 120,
|
||||||
buttons: [
|
buttons: [
|
||||||
{
|
{
|
||||||
text: '交易明细',
|
text: '交易明细',
|
||||||
|
acl: { ability: ['TICKET-ETC-INVOICE-LIST-transaction'] },
|
||||||
click: item => this.showDetail(item)
|
click: item => this.showDetail(item)
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@ -1,3 +1,13 @@
|
|||||||
|
<!--
|
||||||
|
* @Description :
|
||||||
|
* @Version : 1.0
|
||||||
|
* @Author : Shiming
|
||||||
|
* @Date : 2022-04-28 20:27:08
|
||||||
|
* @LastEditors : Shiming
|
||||||
|
* @LastEditTime : 2022-04-29 14:21:05
|
||||||
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\etc-invoiced-logs\\etc-invoiced-logs.component.html
|
||||||
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
|
-->
|
||||||
<page-header-wrapper [title]="'已开发票'">
|
<page-header-wrapper [title]="'已开发票'">
|
||||||
</page-header-wrapper>
|
</page-header-wrapper>
|
||||||
|
|
||||||
@ -13,7 +23,7 @@
|
|||||||
class="text-right">
|
class="text-right">
|
||||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
|
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
|
||||||
<button nz-button (click)="resetSF()">重置</button>
|
<button nz-button (click)="resetSF()">重置</button>
|
||||||
<button nz-button (click)="exportList()"> 导出</button>
|
<button nz-button (click)="exportList()" acl [acl-ability]="['TICKET-ETC-INVOICE-LOGS-export']"> 导出</button>
|
||||||
<button nz-button nzType="link" (click)="expandToggle()">
|
<button nz-button nzType="link" (click)="expandToggle()">
|
||||||
{{ !_$expand ? '展开' : '收起' }}
|
{{ !_$expand ? '展开' : '收起' }}
|
||||||
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
|
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
|
||||||
|
|||||||
@ -21,7 +21,7 @@
|
|||||||
class="text-right">
|
class="text-right">
|
||||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
|
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
|
||||||
<button nz-button (click)="resetSF()">重置</button>
|
<button nz-button (click)="resetSF()">重置</button>
|
||||||
<button nz-button (click)="exprot()"> 导出</button>
|
<button nz-button (click)="exprot()" acl [acl-ability]="['TICKET-ETC-INVOICE-REQUESTED-export']"> 导出</button>
|
||||||
<button nz-button nzType="link" (click)="expandToggle()">
|
<button nz-button nzType="link" (click)="expandToggle()">
|
||||||
{{ !_$expand ? '展开' : '收起' }}
|
{{ !_$expand ? '展开' : '收起' }}
|
||||||
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
|
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
|
||||||
@ -33,7 +33,7 @@
|
|||||||
<nz-card class="content-box" nzBordered>
|
<nz-card class="content-box" nzBordered>
|
||||||
|
|
||||||
<div class="d-flex align-items-center mb-md mt-md">
|
<div class="d-flex align-items-center mb-md mt-md">
|
||||||
<button nz-button (click)="this.auditAction()">申请开票</button>
|
<button nz-button (click)="this.auditAction()" acl [acl-ability]="['TICKET-ETC-INVOICE-REQUESTED-apply']">申请开票</button>
|
||||||
<div class="ml-md">
|
<div class="ml-md">
|
||||||
已选择
|
已选择
|
||||||
<strong class="text-primary">{{ selectedRows.length }}</strong> 条运单
|
<strong class="text-primary">{{ selectedRows.length }}</strong> 条运单
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
<nz-card class="content-box">
|
<nz-card class="content-box">
|
||||||
|
|
||||||
<div class="mt-md mb-sm">
|
<div class="mt-md mb-sm">
|
||||||
<button nz-button nzType="primary" (click)="printOrder()">打印面单</button>
|
<button nz-button nzType="primary" (click)="printOrder()" acl [acl-ability]="['TICKET-EXPRESS-INFO-print']">打印面单</button>
|
||||||
</div>
|
</div>
|
||||||
<st #st [data]="url" [columns]="columns" [req]="{ process:beforeReq }" [loading]="false" [page]="{}" [scroll]="{x:'1200px'}"
|
<st #st [data]="url" [columns]="columns" [req]="{ process:beforeReq }" [loading]="false" [page]="{}" [scroll]="{x:'1200px'}"
|
||||||
(change)="stChange($event)"></st>
|
(change)="stChange($event)"></st>
|
||||||
|
|||||||
@ -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 { Component, OnInit, ViewChild } from '@angular/core';
|
||||||
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
|
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
|
||||||
import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form';
|
import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form';
|
||||||
@ -49,6 +59,7 @@ export class ExpressInfoComponent implements OnInit {
|
|||||||
width: 120,
|
width: 120,
|
||||||
type: 'link',
|
type: 'link',
|
||||||
click: (record: any) => this.showDetail(record.expressCode),
|
click: (record: any) => this.showDetail(record.expressCode),
|
||||||
|
acl: { ability: ['TICKET-EXPRESS-INFO-expressInvoices'] },
|
||||||
className: 'text-right'
|
className: 'text-right'
|
||||||
},
|
},
|
||||||
{ title: '寄件人姓名', index: 'sname', width: 150 },
|
{ title: '寄件人姓名', index: 'sname', width: 150 },
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
[class.expend-options]="_$expand">
|
[class.expend-options]="_$expand">
|
||||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
|
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
|
||||||
<button nz-button (click)="resetSF()">重置</button>
|
<button nz-button (click)="resetSF()">重置</button>
|
||||||
<button nz-button> 导出</button>
|
<button nz-button acl [acl-ability]="['VEHICLE-LIST-search']"> 导出</button>
|
||||||
<button nz-button nzType="link" (click)="expandToggle()">
|
<button nz-button nzType="link" (click)="expandToggle()">
|
||||||
{{ !_$expand ? '展开' : '收起' }}
|
{{ !_$expand ? '展开' : '收起' }}
|
||||||
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
|
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
|
||||||
@ -24,7 +24,7 @@
|
|||||||
<nz-card class="content-box" nzBordered>
|
<nz-card class="content-box" nzBordered>
|
||||||
|
|
||||||
<div class="d-flex align-items-center mb-md mt-md">
|
<div class="d-flex align-items-center mb-md mt-md">
|
||||||
<button nz-button (click)="this.addInvoice()" nzType="primary">添加发票</button>
|
<button nz-button (click)="this.addInvoice()" nzType="primary" acl [acl-ability]="['TICKET-INPUT-INVOICE-addInvoice']">添加发票</button>
|
||||||
<div class="ml-md">
|
<div class="ml-md">
|
||||||
已选择
|
已选择
|
||||||
<strong class="text-primary">{{ selectedRows.length }}</strong> 张发票
|
<strong class="text-primary">{{ selectedRows.length }}</strong> 张发票
|
||||||
|
|||||||
@ -256,10 +256,12 @@ export class InputInvoiceComponent implements OnInit {
|
|||||||
buttons: [
|
buttons: [
|
||||||
{
|
{
|
||||||
text: '浏览',
|
text: '浏览',
|
||||||
|
acl: { ability: ['TICKET-INPUT-INVOICE-view'] },
|
||||||
click: item => this.router.navigate(['/ticket/input-invoice/detail/' + item.id])
|
click: item => this.router.navigate(['/ticket/input-invoice/detail/' + item.id])
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '修改',
|
text: '修改',
|
||||||
|
acl: { ability: ['TICKET-INPUT-INVOICE-edit'] },
|
||||||
click: item => this.router.navigate(['/ticket/input-invoice/edit/1'])
|
click: item => this.router.navigate(['/ticket/input-invoice/edit/1'])
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2022-01-21 15:39:30
|
* @Date : 2022-01-21 15:39:30
|
||||||
* @LastEditors : Shiming
|
* @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
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\invoice-requested.component.html
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
-->
|
-->
|
||||||
@ -20,7 +20,7 @@
|
|||||||
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
|
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
|
||||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
|
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
|
||||||
<button nz-button (click)="resetSF()">重置</button>
|
<button nz-button (click)="resetSF()">重置</button>
|
||||||
<button nz-button (click)="exprot()"> 导出</button>
|
<button nz-button (click)="exprot()" acl [acl-ability]="['TICKET-INVOICE-REQUESTED-export']"> 导出</button>
|
||||||
<button nz-button nzType="link" (click)="expandToggle()">
|
<button nz-button nzType="link" (click)="expandToggle()">
|
||||||
{{ !_$expand ? '展开' : '收起' }}
|
{{ !_$expand ? '展开' : '收起' }}
|
||||||
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
|
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
|
||||||
@ -47,12 +47,12 @@
|
|||||||
<strong class="text-red">{{ totalCallNo }}</strong>
|
<strong class="text-red">{{ totalCallNo }}</strong>
|
||||||
<a *ngIf="totalCallNo > 0" (click)="st.clearCheck();totalCallNo=0" class="ml-lg">清空</a>
|
<a *ngIf="totalCallNo > 0" (click)="st.clearCheck();totalCallNo=0" class="ml-lg">清空</a>
|
||||||
</div>
|
</div>
|
||||||
<button nz-button *ngIf="resourceStatus==='1' || !resourceStatus" (click)="this.batchRequested()">批量受理</button>
|
<button nz-button *ngIf="resourceStatus==='1' || !resourceStatus" (click)="this.batchRequested()" acl [acl-ability]="['TICKET-INVOICE-REQUESTED-userApply']">批量受理</button>
|
||||||
<button nz-button *ngIf="resourceStatus==='1' || !resourceStatus"
|
<button nz-button *ngIf="resourceStatus==='1' || !resourceStatus"
|
||||||
(click)="this.rejectAction(selectedRows)">驳回</button>
|
(click)="this.rejectAction(selectedRows)" acl [acl-ability]="['TICKET-INVOICE-REQUESTED-reject']">驳回</button>
|
||||||
<button nz-button *ngIf="resourceStatus !=='4' && resourceStatus !=='5'"
|
<button nz-button *ngIf="resourceStatus !=='4' && resourceStatus !=='5'"
|
||||||
(click)="changeAddress(selectedRows)">修改地址</button>
|
(click)="changeAddress(selectedRows)" acl [acl-ability]="['VEHICLE-LIST-search']">修改地址</button>
|
||||||
<button nz-button *ngIf="resourceStatus==='3' || !resourceStatus" (click)="printOrder(selectedRows)">快递下单</button>
|
<button nz-button *ngIf="resourceStatus==='3' || !resourceStatus" (click)="printOrder(selectedRows)" acl [acl-ability]="['VEHICLE-LIST-search']">快递下单</button>
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|
||||||
|
|||||||
@ -513,25 +513,30 @@ export class InvoiceRequestedComponent {
|
|||||||
{
|
{
|
||||||
text: '开票受理<br/>',
|
text: '开票受理<br/>',
|
||||||
click: item => this.requestedInvoiceAction(item),
|
click: item => this.requestedInvoiceAction(item),
|
||||||
|
acl: { ability: ['TICKET-INVOICE-REQUESTED-requestedInvoiceAction'] },
|
||||||
iif: item => item.sts === '1'
|
iif: item => item.sts === '1'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '驳回申请<br/>',
|
text: '驳回申请<br/>',
|
||||||
click: item => this.rejectAction([item]),
|
click: item => this.rejectAction([item]),
|
||||||
|
acl: { ability: ['TICKET-INVOICE-REQUESTED-rejectAction'] },
|
||||||
iif: item => item.sts === '1'
|
iif: item => item.sts === '1'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '订单明细<br/>',
|
text: '订单明细<br/>',
|
||||||
|
acl: { ability: ['TICKET-INVOICE-REQUESTED-detail'] },
|
||||||
click: item => this.router.navigate([`/ticket/invoice-requested/detail/${item?.id}`], { queryParams: { sts: item.sts } })
|
click: item => this.router.navigate([`/ticket/invoice-requested/detail/${item?.id}`], { queryParams: { sts: item.sts } })
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '查看原因<br/>',
|
text: '查看原因<br/>',
|
||||||
click: item => this.showReason(item),
|
click: item => this.showReason(item),
|
||||||
|
acl: { ability: ['TICKET-INVOICE-REQUESTED-viewResult'] },
|
||||||
iif: item => item.sts === '4'
|
iif: item => item.sts === '4'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '下载对账单',
|
text: '下载对账单',
|
||||||
iif: item => item.sts === '3',
|
iif: item => item.sts === '3',
|
||||||
|
acl: { ability: ['TICKET-INVOICE-REQUESTED-downloadPDF'] },
|
||||||
click: item => this.downloadPdf(item)
|
click: item => this.downloadPdf(item)
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@ -347,6 +347,7 @@ export class InvoicedListComponent implements OnInit {
|
|||||||
{ type: 'divider' },
|
{ type: 'divider' },
|
||||||
{
|
{
|
||||||
text: '查看明细<br>',
|
text: '查看明细<br>',
|
||||||
|
acl: { ability: ['TICKET-INVOICE-LIST-view'] },
|
||||||
click: item =>
|
click: item =>
|
||||||
this.router.navigate(['/ticket/invoice-list/detail/' + item.id], {
|
this.router.navigate(['/ticket/invoice-list/detail/' + item.id], {
|
||||||
queryParams: { expressno: item.expressno, type: 2, ltdId: item.shipperId }
|
queryParams: { expressno: item.expressno, type: 2, ltdId: item.shipperId }
|
||||||
@ -354,26 +355,31 @@ export class InvoicedListComponent implements OnInit {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '取消开票<br>',
|
text: '取消开票<br>',
|
||||||
|
acl: { ability: ['TICKET-INVOICE-LIST-canceInvoice'] },
|
||||||
click: item => this.canceInvoice(item),
|
click: item => this.canceInvoice(item),
|
||||||
iif: item => item.sts === '1'
|
iif: item => item.sts === '1'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '发票作废<br>',
|
text: '发票作废<br>',
|
||||||
|
acl: { ability: ['TICKET-INVOICE-LIST-deletedInvoice'] },
|
||||||
click: item => this.deletedInvoice(item),
|
click: item => this.deletedInvoice(item),
|
||||||
iif: item => item.sts === '3'
|
iif: item => item.sts === '3'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '查看物流<br>',
|
text: '查看物流<br>',
|
||||||
|
acl: { ability: ['TICKET-INVOICE-LIST-showExpress'] },
|
||||||
click: item => this.showlogosticsLogs(item),
|
click: item => this.showlogosticsLogs(item),
|
||||||
iif: item => item.expresscompany
|
iif: item => item.expresscompany
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '填写物流<br>',
|
text: '填写物流<br>',
|
||||||
|
acl: { ability: ['TICKET-INVOICE-LIST-writeExpress'] },
|
||||||
click: item => this.requestedAction(item),
|
click: item => this.requestedAction(item),
|
||||||
iif: item => !item.expresscompany
|
iif: item => !item.expresscompany
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '修改物流<br>',
|
text: '修改物流<br>',
|
||||||
|
acl: { ability: ['TICKET-INVOICE-LIST-updateExpress'] },
|
||||||
click: item => this.requestedAction(item),
|
click: item => this.requestedAction(item),
|
||||||
iif: item => item.expresscompany
|
iif: item => item.expresscompany
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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 { NgModule } from '@angular/core';
|
||||||
import { RouterModule, Routes } from '@angular/router';
|
import { RouterModule, Routes } from '@angular/router';
|
||||||
import { BillingOrderComponent } from './components/billing-order/billing-order.component';
|
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';
|
import { InvoicedListComponent } from './components/invoiced-list/invoiced-list.component';
|
||||||
|
|
||||||
const routes: Routes = [
|
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-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: '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: 'cancellation-invoice/detail/:id', component: InvoiceDetailComponent },
|
||||||
{ path: 'etc-invoice-requested', component: ETCInvoicedRequestedComponent },
|
{ path: 'etc-invoice-requested', component: ETCInvoicedRequestedComponent , data: { guard: { ability: ['TICKET-ETC-INVOICE-REQUESTED-list'] } } },
|
||||||
{ path: 'etc-invoice-list', component: ETCInvoicedListComponent },
|
{ path: 'etc-invoice-list', component: ETCInvoicedListComponent, data: { guard: { ability: ['TICKET-ETC-INVOICE-LIST-list'] } } },
|
||||||
{ path: 'etc-invoiced-logs', component: ETCInvoicedLogsComponent },
|
{ path: 'etc-invoiced-logs', component: ETCInvoicedLogsComponent , data: { guard: { ability: ['TICKET-ETC-INVOICE-LOGS-list'] } }},
|
||||||
{ path: 'etc-blacklist', component: ETCBlacklistComponent },
|
{ path: 'etc-blacklist', component: ETCBlacklistComponent , data: { guard: { ability: ['TICKET-ETC-BLACK_LIST-freightList'] } }},
|
||||||
{ path: 'input-invoice', component: InputInvoiceComponent },
|
{ path: 'input-invoice', component: InputInvoiceComponent , data: { guard: { ability: ['TICKET-INPUT-INVOICE-list'] } }},
|
||||||
{ path: 'input-invoice/detail/:id', component: InputInvoiceDetailComponent },
|
{ path: 'input-invoice/detail/:id', component: InputInvoiceDetailComponent },
|
||||||
{ path: 'input-invoice/edit/:id', component: EditCollectionInvoiceComponent },
|
{ path: 'input-invoice/edit/:id', component: EditCollectionInvoiceComponent },
|
||||||
{ path: 'express-info', component: ExpressInfoComponent },
|
{ path: 'express-info', component: ExpressInfoComponent , data: { guard: { ability: ['TICKET-EXPRESS-INFO-list'] } }},
|
||||||
{ path: 'billing-order', component: BillingOrderComponent }
|
{ path: 'billing-order', component: BillingOrderComponent, data: { guard: { ability: ['TICKET-BILLING-ORDER-search'] } } }
|
||||||
];
|
];
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
|
|||||||
Reference in New Issue
Block a user