车辆接口更新

This commit is contained in:
wangshiming
2022-01-20 15:12:09 +08:00
parent d51c0d0801
commit a68612626b
3 changed files with 65 additions and 55 deletions

View File

@ -29,12 +29,12 @@ export class ETCInvoicedLogsComponent implements OnInit {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {
...this.sf.value, ...this.sf.value,
exTime: { exTime: {
start: this.sf.value.exTime?.[0] || null, start: this.sf.value.exTime?.[0] || '',
end: this.sf.value.exTime?.[1] || null end: this.sf.value.exTime?.[1] || ''
}, },
invoiceMakeTime: { invoiceMakeTime: {
start: this.sf.value.invoiceMakeTime?.[0] || null, start: this.sf.value.invoiceMakeTime?.[0] || '',
end: this.sf.value.invoiceMakeTime?.[1] || null end: this.sf.value.invoiceMakeTime?.[1] || ''
} }
}); });
} }

View File

@ -1,59 +1,69 @@
<page-header-wrapper [title]="'已开发票'"> <page-header-wrapper [title]="'已开发票'"> </page-header-wrapper>
</page-header-wrapper>
<nz-card class="search-box" nzBordered> <nz-card class="search-box" nzBordered>
<div nz-row nzGutter="8"> <div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24"> <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema" <sf
[ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true" #sf
[button]="'none'"></sf> [schema]="searchSchema"
</div> [ui]="{ '*': { spanLabelFixed: 90, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" [compact]="true"
class="text-right"> [button]="'none'"
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button> ></sf>
<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> </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>
<nz-card nzBordered> <nz-card nzBordered>
<div class="d-flex align-items-center mb-md"> <div class="d-flex align-items-center mb-md">
<button nz-button (click)="this.deletedInvoice()">作废发票</button> <button nz-button (click)="this.deletedInvoice()">作废发票</button>
<button nz-button (click)="this.invoiceHongChong()">发票红冲</button> <button nz-button (click)="this.invoiceHongChong()">发票红冲</button>
<div class="ml-md"> <div class="ml-md">
已选择 已选择
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 开票金额总计 <strong <strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 开票金额总计
class="text-red">{{ <strong class="text-red">{{ totalCallNo }}</strong>
totalCallNo }}</strong> <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
<a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
</div>
</div> </div>
</div>
<st #st [data]="service.$api_get_invoice_page" [columns]="columns" <st
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }" #st
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [data]="service.$api_get_invoice_page"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [columns]="columns"
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)"> [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
<ng-template st-row="no" let-item let-index="index"> [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
{{item.no}} [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
<a>预览发票</a> [loading]="service.http.loading"
</ng-template> [scroll]="{ x: '1200px', y: '370px' }"
<ng-template st-row="expresscompany" let-item let-index="index" let-column="column"> (change)="stChange($event)"
{{ item.expresscompany }} <br> {{ item.expressno }} >
</ng-template> <ng-template st-row="no" let-item let-index="index">
</st> {{ 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> </nz-card>
<ng-template #logosticsLogsModal> <ng-template #logosticsLogsModal>
<p class="mb-xl"> <p class="mb-xl">
顺丰快递: {{routesInfo?.mailNo}} 顺丰快递: {{ routesInfo?.mailNo }}
<nz-tag [nzColor]="'#2db7f5'" class="ml-md">已签收</nz-tag> <nz-tag [nzColor]="'#2db7f5'" class="ml-md">已签收</nz-tag>
</p> </p>
<app-logistics-time-line [data]="routesInfo?.routes"></app-logistics-time-line> <app-logistics-time-line [data]="routesInfo?.routes"></app-logistics-time-line>
</ng-template> </ng-template>

View File

@ -210,14 +210,14 @@ export class InvoicedListComponent implements OnInit {
className: 'text-right', className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) } 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: '税额', title: '税额',
index: 'disvattax', index: 'vattax',
width: 90, width: 90,
type: 'widget', type: 'widget',
className: 'text-right', 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 }, { title: '开票日期', index: 'invoicedate', type: 'date', width: 150 },
{ {