Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-03-04 13:34:16 +08:00
parent a98a0592ea a1a73bebfa
commit bd6fa847fa
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts
View File

@ -209,7 +209,7 @@ export class InvoiceDetailComponent implements OnInit {
private initCostST(): STColumn[] { private initCostST(): STColumn[] {
return [ return [
{ title: '费用号', index: 'feeHId' }, { title: '费用号', index: 'feeHId' },
{ title: '订单号', index: 'billHId' }, { title: '订单号', index: 'billHCode' },
{ title: '订单日期', index: 'createTime', type: 'date' }, { title: '订单日期', index: 'createTime', type: 'date' },
{ title: '计费日期', index: 'feeDate', type: 'date' }, { title: '计费日期', index: 'feeDate', type: 'date' },
{ title: '税率', index: 'vatrate', format: item => `${item.vatrate ? ((item.vatrate as number) * 100).toFixed(2) : 0}%` }, { title: '税率', index: 'vatrate', format: item => `${item.vatrate ? ((item.vatrate as number) * 100).toFixed(2) : 0}%` },

6
src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html
View File

@ -16,10 +16,10 @@
{{headerInfo?.vatappcode}} {{headerInfo?.vatappcode}}
</se> </se>
<se label="已开/全部订单数"> <se label="已开/全部订单数">
{{headerInfo?.vatinvBillNum}} / {{headerInfo?.ordlines}} {{headerInfo?.ordlines}} / {{headerInfo?.vatinvBillNum}}
</se> </se>
<se label="已开/全部发票金额"> <se label="已开/全部发票金额">
{{headerInfo?.vatinvHAmount}} / {{headerInfo?.vatinvHAmount}} {{headerInfo?.vatinvHAmount}} / {{headerInfo?.vatinvHNumAmount}}
</se> </se>
<se label="已开发票张数"> <se label="已开发票张数">
{{headerInfo?.vatinvHNum}} {{headerInfo?.vatinvHNum}}
@ -96,7 +96,7 @@
<div class="d-flex align-items-center mb-md mt-sm" *ngIf="sts==='1'"> <div class="d-flex align-items-center mb-md mt-sm" *ngIf="sts==='1'">
<button nz-button (click)="openRequestedModal('1')">全部开票</button> <button nz-button (click)="openRequestedModal('1')">全部开票</button>
<button nz-button (click)="openRequestedModal('2')">开票</button> <button nz-button (click)="openRequestedModal('2')">开票</button>
<button nz-button (click)="removeOrder()">移除</button> <!-- <button nz-button (click)="removeOrder()">移除</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; 开票金额总计 <strong