Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
Taric Xin
@ -327,23 +327,23 @@ export class CancellationInvoiceComponent implements OnInit {
|
||||
iif: item => item.sts != '3',
|
||||
click: item => this.requestedAction(item)
|
||||
},
|
||||
{
|
||||
text: '推送开票',
|
||||
iif: item => item.sts != '3',
|
||||
click: item => this.pushInvoiceAction(item)
|
||||
},
|
||||
{
|
||||
text: '移除',
|
||||
click: item => this.batchRemove(item)
|
||||
},
|
||||
{
|
||||
text: '确认'
|
||||
// click: item => this.rejectAction(item)
|
||||
},
|
||||
{
|
||||
text: '撤回',
|
||||
click: item => this.batchWithdraw(item)
|
||||
}
|
||||
// {
|
||||
// text: '推送开票',
|
||||
// iif: item => item.sts != '3',
|
||||
// click: item => this.pushInvoiceAction(item)
|
||||
// },
|
||||
// {
|
||||
// text: '移除',
|
||||
// click: item => this.batchRemove(item)
|
||||
// },
|
||||
// {
|
||||
// text: '确认'
|
||||
// // click: item => this.rejectAction(item)
|
||||
// },
|
||||
// {
|
||||
// text: '撤回',
|
||||
// click: item => this.batchWithdraw(item)
|
||||
// }
|
||||
]
|
||||
}
|
||||
];
|
||||
|
||||
@ -29,12 +29,12 @@ export class ETCInvoicedLogsComponent implements OnInit {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value,
|
||||
exTime: {
|
||||
start: this.sf.value.exTime?.[0] || null,
|
||||
end: this.sf.value.exTime?.[1] || null
|
||||
start: this.sf.value.exTime?.[0] || '',
|
||||
end: this.sf.value.exTime?.[1] || ''
|
||||
},
|
||||
invoiceMakeTime: {
|
||||
start: this.sf.value.invoiceMakeTime?.[0] || null,
|
||||
end: this.sf.value.invoiceMakeTime?.[1] || null
|
||||
start: this.sf.value.invoiceMakeTime?.[0] || '',
|
||||
end: this.sf.value.invoiceMakeTime?.[1] || ''
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@ -63,7 +63,7 @@
|
||||
<button nz-button nzType="primary" (click)="saveInvoices()">保 存</button>
|
||||
</ng-container>
|
||||
<ng-template #elseTemplate>
|
||||
<button nz-button nzType="primary" (click)="isEdit = true">修改</button>
|
||||
<!-- <button nz-button nzType="primary" (click)="isEdit = true">修改</button> -->
|
||||
</ng-template>
|
||||
</div>
|
||||
</div>
|
||||
@ -83,7 +83,7 @@
|
||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading"
|
||||
(click)="orderST?.load(1)">查询</button>
|
||||
<button nz-button (click)="resetSF(1)">重置</button>
|
||||
<button nz-button> 导出</button>
|
||||
<!-- <button nz-button> 导出</button> -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -46,9 +46,9 @@
|
||||
<a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
|
||||
</div>
|
||||
<button nz-button (click)="this.batchRequested()">开票</button>
|
||||
<button nz-button (click)="this.rejectAction(selectedRows)">驳回</button>
|
||||
<!-- <button nz-button (click)="this.rejectAction(selectedRows)">驳回</button>
|
||||
<button nz-button (click)="changePice(selectedRows)">修改地址</button>
|
||||
<button nz-button (click)="printOrder(selectedRows)">打印面单</button>
|
||||
<button nz-button (click)="printOrder(selectedRows)">打印面单</button> -->
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
|
||||
@ -415,13 +415,13 @@ export class InvoiceRequestedComponent implements OnInit {
|
||||
buttons: [
|
||||
{ type: 'divider' },
|
||||
{
|
||||
text: '开票',
|
||||
text: '开票<br/>',
|
||||
click: item => this.requestedInvoiceAction(item)
|
||||
},
|
||||
{
|
||||
text: '驳回<br/>',
|
||||
click: item => this.rejectAction([item])
|
||||
},
|
||||
// {
|
||||
// text: '驳回<br/>',
|
||||
// click: item => this.rejectAction([item])
|
||||
// },
|
||||
{
|
||||
text: '订单明细<br/>',
|
||||
click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id])
|
||||
@ -430,10 +430,10 @@ export class InvoiceRequestedComponent implements OnInit {
|
||||
text: '查看原因<br/>',
|
||||
click: item => this.showReason(item)
|
||||
},
|
||||
{
|
||||
text: '下载对账单'
|
||||
// click: item => this.rejectAction(item)
|
||||
}
|
||||
// {
|
||||
// text: '下载对账单'
|
||||
// // click: item => this.rejectAction(item)
|
||||
// }
|
||||
]
|
||||
}
|
||||
];
|
||||
|
||||
@ -1,59 +1,69 @@
|
||||
<page-header-wrapper [title]="'已开发票'">
|
||||
</page-header-wrapper>
|
||||
|
||||
<page-header-wrapper [title]="'已开发票'"> </page-header-wrapper>
|
||||
|
||||
<nz-card class="search-box" nzBordered>
|
||||
<div nz-row nzGutter="8">
|
||||
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
|
||||
<sf #sf [schema]="searchSchema"
|
||||
[ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
|
||||
[button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
|
||||
class="text-right">
|
||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
|
||||
<button nz-button (click)="resetSF()">重置</button>
|
||||
<button nz-button> 导出</button>
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
{{ !_$expand ? '展开' : '收起' }}
|
||||
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
|
||||
</button>
|
||||
</div>
|
||||
<div nz-row nzGutter="8">
|
||||
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
|
||||
<sf
|
||||
#sf
|
||||
[schema]="searchSchema"
|
||||
[ui]="{ '*': { spanLabelFixed: 90, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
|
||||
[compact]="true"
|
||||
[button]="'none'"
|
||||
></sf>
|
||||
</div>
|
||||
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
|
||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
|
||||
<button nz-button (click)="resetSF()">重置</button>
|
||||
<!-- <button nz-button> 导出</button> -->
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
{{ !_$expand ? '展开' : '收起' }}
|
||||
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzBordered>
|
||||
<div class="d-flex align-items-center mb-md">
|
||||
<button nz-button (click)="this.deletedInvoice()">作废发票</button>
|
||||
<button nz-button (click)="this.invoiceHongChong()">发票红冲</button>
|
||||
<div class="ml-md">
|
||||
已选择
|
||||
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据 开票金额总计 <strong
|
||||
class="text-red">{{
|
||||
totalCallNo }}</strong>
|
||||
<a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="d-flex align-items-center mb-md">
|
||||
<!-- <button nz-button (click)="this.deletedInvoice()">作废发票</button>
|
||||
<button nz-button (click)="this.invoiceHongChong()">发票红冲</button> -->
|
||||
<!-- <div class="ml-md">
|
||||
已选择
|
||||
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据 开票金额总计
|
||||
<strong class="text-red">{{ totalCallNo }}</strong>
|
||||
<a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
|
||||
</div> -->
|
||||
</div>
|
||||
|
||||
<st #st [data]="service.$api_get_invoice_page" [columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
|
||||
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
|
||||
<ng-template st-row="no" let-item let-index="index">
|
||||
{{item.no}}
|
||||
<a>预览发票</a>
|
||||
</ng-template>
|
||||
<ng-template st-row="expresscompany" let-item let-index="index" let-column="column">
|
||||
{{ item.expresscompany }} <br> {{ item.expressno }}
|
||||
</ng-template>
|
||||
</st>
|
||||
<st
|
||||
#st
|
||||
[data]="service.$api_get_invoice_page"
|
||||
[columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
|
||||
[loading]="service.http.loading"
|
||||
[scroll]="{ x: '1200px', y: '370px' }"
|
||||
(change)="stChange($event)"
|
||||
>
|
||||
<ng-template st-row="no" let-item let-index="index">
|
||||
{{ item.no }}
|
||||
<a>预览发票</a>
|
||||
</ng-template>
|
||||
<ng-template st-row="vatrate" let-item let-index="index">
|
||||
0.09
|
||||
</ng-template>
|
||||
<ng-template st-row="expresscompany" let-item let-index="index" let-column="column">
|
||||
{{ item.expresscompany }} <br />
|
||||
{{ item.expressno }}
|
||||
</ng-template>
|
||||
</st>
|
||||
</nz-card>
|
||||
|
||||
<ng-template #logosticsLogsModal>
|
||||
<p class="mb-xl">
|
||||
顺丰快递: {{routesInfo?.mailNo}}
|
||||
<nz-tag [nzColor]="'#2db7f5'" class="ml-md">已签收</nz-tag>
|
||||
</p>
|
||||
<app-logistics-time-line [data]="routesInfo?.routes"></app-logistics-time-line>
|
||||
</ng-template>
|
||||
<p class="mb-xl">
|
||||
顺丰快递: {{ routesInfo?.mailNo }}
|
||||
<nz-tag [nzColor]="'#2db7f5'" class="ml-md">已签收</nz-tag>
|
||||
</p>
|
||||
<app-logistics-time-line [data]="routesInfo?.routes"></app-logistics-time-line>
|
||||
</ng-template>
|
||||
|
||||
@ -210,14 +210,14 @@ export class InvoicedListComponent implements OnInit {
|
||||
className: 'text-right',
|
||||
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
|
||||
},
|
||||
{ title: '税率', index: 'vatrate', className: 'text-right', width: 90 },
|
||||
{ title: '税率', render: 'vatrate', className: 'text-right', width: 90 },
|
||||
{
|
||||
title: '税额',
|
||||
index: 'disvattax',
|
||||
index: 'vattax',
|
||||
width: 90,
|
||||
type: 'widget',
|
||||
className: 'text-right',
|
||||
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.disvattax }) }
|
||||
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) }
|
||||
},
|
||||
{ title: '开票日期', index: 'invoicedate', type: 'date', width: 150 },
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user