-
+ [page]="{ show: true, showSize: true, pageSizes: [5, 10, 20, 50, 100, 200, 500] }"
+ [loading]="service.http.loading"
+ [scroll]="{ x: '1200px' }"
+ >
- - {{item.amount | currency }}
- + {{item.amount | currency }}
+ - {{ item.amount | currency }}
+ + {{ item.amount | currency }}
-
@@ -59,21 +87,26 @@
- {{detailRecord?.ltdName}}
- {{detailRecord?.totalRebate |currency: ' '}}
+ {{ detailRecord?.ltdName }}
+ {{ detailRecord?.totalRebate | currency: ' ' }}
-
+
- {{item?.year }}年
- {{item?.month }}月
+ {{ item?.year }}年
+ {{ item?.month }}月
- {{item?.profitAmountSum |currency :' '}}
+ {{ item?.profitAmountSum | currency: ' ' }}
-
diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
index b9ad63e2..396cc970 100644
--- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts
@@ -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)
+ },
]
},
];
diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
index 1faa2dbe..adc012af 100644
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
@@ -95,6 +95,9 @@
{{ item?.orderAmount | currency }}
+
+ {{ item?.wayAmount | currency }}
+
diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
index 3b9ea67b..fb1280d1 100644
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
@@ -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' },