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

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-05-11 19:52:56 +08:00
parent 9dbafb2a30
commit 081d185d4c
4 changed files with 81 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html
View File

@ -1,3 +1,13 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-28 20:27:07
* @LastEditors : Shiming
* @LastEditTime : 2022-05-11 19:42:40
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\account-management\\components\\recorded-detail\\recorded-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'待入账明细'" [logo]="logo">
<ng-template #logo>
<button nz-button (click)="goBack()">
@ -6,29 +16,44 @@
</ng-template>
</page-header-wrapper>
<nz-card>
<sv-container layout="vertical" [noColon]="true" col="5">
<sv [label]="labelTpl">
<b class="text-md ">{{summaryObj?.taxno}}</b>
<sv-container layout="vertical" [noColon]="true" col="6">
<sv label="合伙人信息">
<div
><b>{{ summaryObj?.partnerName }}</b></div
>
<div
><b>{{ summaryObj?.partnerInfo }}</b></div
>
</sv>
<sv label="返佣总额">
<span class="text-error-dark font-weight-bold">{{(summaryObj?.totalRebate?summaryObj?.totalRebate: 0 )|currency :'
'}}</span>
<span class="text-error-dark font-weight-bold">{{ (summaryObj?.totalRebate ? summaryObj?.totalRebate : 0) | currency }}</span>
</sv>
<sv label="已入账金额">
<span class="text-error-dark font-weight-bold">{{(summaryObj?.recordedAmount?summaryObj?.recordedAmount:0
)|currency:' '}}</span>
<span class="text-error-dark font-weight-bold">{{ (summaryObj?.recordedAmount ? summaryObj?.recordedAmount : 0) | currency }}</span>
</sv>
<sv label="代缴个税">
<span class="text-error-dark font-weight-bold">{{(summaryObj?.taxPersonalSum?summaryObj?.taxPersonalSum:0
)|currency:' '}}</span>
<sv label="已代缴个税">
<span class="text-error-dark font-weight-bold">{{
(summaryObj?.recordedTaxPersonal ? summaryObj?.recordedTaxPersonal : 0) | currency
}}</span>
</sv>
<sv label="入账中金额">
<span class="text-error-dark font-weight-bold">{{
(summaryObj?.ongoingRecordedAmount ? summaryObj?.ongoingRecordedAmount : 0) | currency
}}</span>
</sv>
<sv label="代缴中个税">
<span class="text-error-dark font-weight-bold">{{
(summaryObj?.waitRecordedTaxPersonal ? summaryObj?.waitRecordedTaxPersonal : 0) | currency
}}</span>
</sv>
<sv label="待入账金额">
<span class="text-error-dark font-weight-bold">{{(summaryObj?.waitRecordedAmount?summaryObj?.waitRecordedAmount:0)
|currency:' '}}</span>
<span class="text-error-dark font-weight-bold">{{
(summaryObj?.waitRecordedAmount ? summaryObj?.waitRecordedAmount : 0) | currency
}}</span>
</sv>
</sv-container>
<ng-template #labelTpl>
<b class="text-md" style="color: black;">{{summaryObj?.ltdName}}</b>
<b class="text-md" style="color: black">{{ summaryObj?.ltdName }}</b>
</ng-template>
</nz-card>
<nz-card>
@ -36,22 +61,25 @@
<sf mode="search" #sf [schema]="schema" [ui]="ui" (formSubmit)="search()" (formReset)="resetSF()"></sf>
</div>
<div class="table-content">
<st #st [data]="service.$api_get_invoice_detail_page " [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: {pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
<st
#st
[data]="service.$api_get_invoice_detail_page"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [5,10, 20, 50, 100, 200, 500] }"
[loading]="service.http.loading" [scroll]="{x:'1200px'}">
[page]="{ show: true, showSize: true, pageSizes: [5, 10, 20, 50, 100, 200, 500] }"
[loading]="service.http.loading"
[scroll]="{ x: '1200px' }"
>
<ng-template st-row="amount" let-item>
<div *ngIf="item.incomeType === '1'"> - {{item.amount | currency }}</div>
<div *ngIf="item.incomeType === '2'"> + {{item.amount | currency }}</div>
<div *ngIf="item.incomeType === '1'"> - {{ item.amount | currency }}</div>
<div *ngIf="item.incomeType === '2'"> + {{ item.amount | currency }}</div>
</ng-template>
</st>
<div class="total-footer text-md" *ngIf="st?.list?.length !== 0 ">
合计 <label class="text-red-dark">{{ footerSummary?.total }}</label> 项，收入 <label
class="text-red-dark font-weight-bold">{{
footerSummary?.income | currency
}}</label>，支出 <label class="text-red-dark font-weight-bold">{{
footerSummary?.spending | currency }}</label>
<div class="total-footer text-md" *ngIf="st?.list?.length !== 0">
合计 <label class="text-red-dark">{{ footerSummary?.total }}</label> 项，收入
<label class="text-red-dark font-weight-bold">{{ footerSummary?.income | currency }}</label
>，支出 <label class="text-red-dark font-weight-bold">{{ footerSummary?.spending | currency }}</label>
</div>
</div>
</nz-card>
@ -59,21 +87,26 @@
<nz-modal [(nzVisible)]="showBillDetail" nzTitle="账户明细" [nzFooter]="null" (nzOnCancel)="handleCancel()" nzWidth="700px">
<div *nzModalContent>
<div class="mb-sm">
<span class="mr-xxl text-sm font-weight-bold"><label>网络货运人：</label>{{detailRecord?.ltdName}}</span>
<span class="text-sm font-weight-bold"><label>返佣总额（元）：</label>{{detailRecord?.totalRebate |currency: ' '}}</span>
<span class="mr-xxl text-sm font-weight-bold"><label>网络货运人：</label>{{ detailRecord?.ltdName }}</span>
<span class="text-sm font-weight-bold"><label>返佣总额（元）：</label>{{ detailRecord?.totalRebate | currency: ' ' }}</span>
</div>
<st #st [data]="billDetailList " [columns]="billDetailColumns" [res]="{ reName: { list: 'data' } }"
[req]="{ method: 'POST', allInBody: true, params:billDetailReqParams}" [page]="{show:false}">
<st
#st
[data]="billDetailList"
[columns]="billDetailColumns"
[res]="{ reName: { list: 'data' } }"
[req]="{ method: 'POST', allInBody: true, params: billDetailReqParams }"
[page]="{ show: false }"
>
<ng-template st-row="month" let-item>
<div>
<span>{{item?.year }}年</span>
<span>{{item?.month }}月</span>
<span>{{ item?.year }}年</span>
<span>{{ item?.month }}月</span>
</div>
</ng-template>
<ng-template st-row="profitAmountSum" let-item>
<div>{{item?.profitAmountSum |currency :' '}}</div>
<div>{{ item?.profitAmountSum | currency: ' ' }}</div>
</ng-template>
</st>
</div>
</nz-modal>

14
src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
View File

@ -81,11 +81,14 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
initST() {
this.columns = [
{ title: '网络货运人', index: 'ltdName', className: 'text-center', width: 200 },
{ title: '银行类型', render: 'bankTypeLabel', className: 'text-center', width: 150 },
{ title: '虚拟账户', render: 'fictitiousAccount', className: 'text-center', width: 200 },
{ title: '银行类型', index: 'bankTypeName', className: 'text-center', width: 150 },
{ title: '虚拟账户', index: 'virtualAccount', className: 'text-center', width: 200 },
{ title: '返佣总额（元）', index: 'totalRebate', className: 'text-center', width: 180, type: 'currency' },
{ title: '已入账金额（元）', index: 'recordedAmount', className: 'text-center', width: 180, type: 'currency' },
{ title: '代缴个税（元）', index: 'taxPersonalSum', className: 'text-center', width: 180, type: 'currency' },
{ title: '已代缴个税（元）', index: 'taxPersonalSum', className: 'text-center', width: 180, type: 'currency' },
{ title: '入账中金额（元）', index: 'taxPersonalSum', className: 'text-center', width: 180, type: 'currency' },
{ title: '代缴中个税（元）', index: 'taxPersonalSum', className: 'text-center', width: 180, type: 'currency' },
{ title: '调整金额（元）', index: 'taxPersonalSum', className: 'text-center', width: 180, type: 'currency' },
{ title: '待入账金额（元）', index: 'waitRecordedAmount', className: 'text-right', width: 180, type: 'currency' },
{
title: '操作', className: 'text-center', width: 300,
@ -100,6 +103,11 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
acl: { ability: ['AN-RECORDED-DETAIL-viewBill'] },
click: (_record) => this.viewAccountDetail(_record)
},
{
text: '调整待入账金额',
acl: { ability: [''] },
click: (_record) => this.viewAccountDetail(_record)
},
]
},
];

3
src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
View File

@ -95,6 +95,9 @@
<ng-template st-row="orderAmount" let-item let-index="index">
<div class="text-right">{{ item?.orderAmount | currency }}</div>
</ng-template>
<ng-template st-row="wayAmount" let-item let-index="index">
<div class="text-right">{{ item?.wayAmount | currency }}</div>
</ng-template>
</st>
</nz-card>
<ng-template #extraTemplate>

2
src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
View File

@ -239,7 +239,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
{ title: '司机身份证号', index: 'driverCertificateNumber', className: 'text-center', width: '180px' },
{ title: '车牌号', index: 'carNo', className: 'text-center', width: '100px' },
{ title: '货物信息', render: 'goodsName', className: 'text-center', width: '200px' },
{ title: '运费金额', render: 'orderAmount', className: 'text-center', width: '100px' },
{ title: '运费金额', render: 'wayAmount', className: 'text-center', width: '100px' },
{ title: '装卸方式', index: 'loadingUnloadWay', className: 'text-center', width: '180px' },
{ title: '支付方式', index: 'payMent', className: 'text-center', width: '150px' },
{ title: '支付账号', index: 'paymentAccount', className: 'text-center', width: '200px' },