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:
Taric Xin
2022-03-25 14:59:01 +08:00
parent a81d685b67 441eaacecf
commit 73f9f1a6a4
4 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -484,8 +484,8 @@ export class OrderManagementBulkComponent implements OnInit {
width: '170px',
className: 'text-left',
format: (item: any) =>
`${item.acceptWeight || '0'}吨/
${item.acceptVolume || '0'}方`
`${item.loadWeight || '0'}吨/
${item.loadVolume || '0'}方`
},
{
title: '结算数量',

13
src/app/routes/partner/recorded/components/record/record.component.html
View File

@ -8,7 +8,7 @@
</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" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" (click)="search()">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
@ -51,12 +51,15 @@
</ng-template>
</st>
<div class=" text-md" *ngIf="st?.list?.length !== 0 ">
<span class="mr-md">合伙人数：<label class="text-red-dark font-weight-bold">{{totalInfo?.partnerNum}}</label></span>
<span class="mr-md">合伙人数：<label
class="text-red-dark font-weight-bold">{{totalInfo?.invoiceAmountSum}}</label></span>
<span class="mr-md">入账笔数：<label class="text-red-dark font-weight-bold">{{totalInfo?.count}}</label></span>
<span class="mr-md">开票金额：<label class="text-red-dark font-weight-bold">{{totalInfo?.invoiceAmount}}</label></span>
<span class="mr-md">代缴个税：<label class="text-red-dark font-weight-bold">{{totalInfo?.tax}}</label></span>
<span class="mr-md">开票金额：<label
class="text-red-dark font-weight-bold">{{totalInfo?.invoiceEntryNum}}</label></span>
<span class="mr-md">代缴个税：<label
class="text-red-dark font-weight-bold">{{totalInfo?.taxPersonalSum}}</label></span>
<span class="mr-md">入账金额：<label
class="text-red-dark font-weight-bold">{{totalInfo?.recorededAmount}}</label></span>
class="text-red-dark font-weight-bold">{{totalInfo?.recordedAmountSum}}</label></span>
</div>
</div>
</nz-card>

27
src/app/routes/partner/recorded/components/record/record.component.ts
View File

@ -22,11 +22,11 @@ export class PartnerRecordedRecordComponent implements OnInit {
columns!: STColumn[];
searchSchema!: SFSchema;
totalInfo: any = {
partnerNum: 34,
count: 98,
invoiceAmount: 978239.98,
tax: 9878.00,
recorededAmount: 728698.98
invoiceAmountSum: 0,
invoiceEntryNum: 0,
partnerNum: 0,
recordedAmountSum: 0,
taxPersonalSum: 0
}
_$expand = false;
@ -306,7 +306,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
},
{ title: '提交时间', index: 'submitTime', width: 160, className: 'text-center' },
{ title: '提交时间', index: 'submitTime', width: 180, className: 'text-center' },
{ title: '入账状态', index: 'stsLabel', width: 120, className: 'text-center' },
{
title: '操作',
@ -345,4 +345,19 @@ export class PartnerRecordedRecordComponent implements OnInit {
}
});
}
search() {
this.st.load(1);
this.getSummary();
}
/**
* 底部统计
*/
getSummary() {
this.service.request(this.service.$api_get_list_summary, { ...this.sf.value }).subscribe(res => {
if (res) {
this.totalInfo = res;
}
})
}
}

1
src/app/routes/partner/recorded/services/recorded.service.ts
View File

@ -11,6 +11,7 @@ export class RecordedService extends BaseService {
$api_disagree_recorded = ``; // 拒绝审核
$api_agree_recorded = ``; // 同意审核
$api_audit_recored = `/api/bpc/partnerInvoiceEntry/oprationAudit`; // 审核单据
$api_get_list_summary = `/api/bpc/partnerInvoiceEntry/invoiceEntrySummary`; // 每页统计
constructor(public injector: Injector) {
super(injector);
}