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 15:11:47 +08:00
parent 0b28bf768e
commit 2579a38d01
3 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/routes/partner/recorded/components/detail/detail.component.html
View File

@ -4,8 +4,8 @@
* @Author : Shiming
* @Date : 2022-01-05 20:15:41
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:17:19
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\withdrawals-record\\withdrawals-detail\\withdrawals-detail.component.html
* @LastEditTime : 2022-05-11 15:06:17
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\recorded\\components\\detail\\detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'入账详情'" [logo]="logo" [action]="action">
@ -40,7 +40,7 @@
{{formData?.entryNumber}}
</se>
<se label="银行类型">
{{formData?.bankName}}
{{formData?.bankType}}
</se>
<se label="虚拟账户">
{{formData?.fictitiousAccount}}
@ -58,7 +58,10 @@
{{formData?.recordedAmount | currency}}
</se>
<se label="入账状态">
{{formData?.stsLabel}}
<span *ngIf="formData?.sts == '1'">待审核</span>
<span *ngIf="formData?.sts == '2'">待复核</span>
<span *ngIf="formData?.sts == '3'">已入账</span>
<span *ngIf="formData?.sts == '4'">已驳回</span>
</se>
<se label="发票图片">
<img *ngIf="formData?.invoiceUrl" nz-image width="100px" height="100px" [nzSrc]="formData?.invoiceUrl" alt="" />

76
src/app/routes/partner/recorded/components/detail/detail.component.ts
View File

@ -29,44 +29,44 @@ export class PartnerRecordedDetailComponent implements OnInit {
this.formData = res;
// 处理流程节点数据
// 流程是否结束
// let isEnd = false;
// if (res.successTime) {
// isEnd = true;
// if (res.refundStatus === '3') {
// this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' });
// } else {
// this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' });
// }
// }
// if (res.agreeTime && res.refundStatus !== '4') {
// this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
// }
// if (res.agreeTime) {
// if (res.refundStatus === '4') {
// isEnd = true;
// this.timeLineData.push({
// time: res.agreeTime,
// value: `拒绝提现<br/>操作人员：${res.handlerUserIdLabel}`,
// color: 'red'
// });
// } else {
// this.timeLineData.push({
// time: res.agreeTime,
// value: `审核通过<br/>操作人员：${res.handlerUserIdLabel}`,
// color: 'gray'
// });
// }
// }
// if (res.createTime) {
// this.timeLineData.push({
// time: res.createTime,
// value: `提交提现申请<br/>提现${res.amount}元至${res.bankName}(${res.bankCardNumber})<br/>操作人员：${res.userIdLabel}`,
// color: 'gray'
// });
// }
// if (this.timeLineData?.length > 0 && !isEnd) {
// this.timeLineData[0].color = 'green';
// }
let isEnd = false;
if (res.successTime) {
isEnd = true;
if (res.refundStatus === '3') {
this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' });
} else {
this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' });
}
}
if (res.agreeTime && res.refundStatus !== '4') {
this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
}
if (res.agreeTime) {
if (res.refundStatus === '4') {
isEnd = true;
this.timeLineData.push({
time: res.agreeTime,
value: `拒绝提现<br/>操作人员：${res.handlerUserIdLabel}`,
color: 'red'
});
} else {
this.timeLineData.push({
time: res.agreeTime,
value: `审核通过<br/>操作人员：${res.handlerUserIdLabel}`,
color: 'gray'
});
}
}
if (res.createTime) {
this.timeLineData.push({
time: res.createTime,
value: `提交提现申请<br/>提现${res.amount}元至${res.bankName}(${res.bankCardNumber})<br/>操作人员：${res.userIdLabel}`,
color: 'gray'
});
}
if (this.timeLineData?.length > 0 && !isEnd) {
this.timeLineData[0].color = 'green';
}
}
});
}

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

@ -226,7 +226,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
{ title: '卸货地详细地址', index: 'unloadDetailedAddress', className: 'text-center', width: '180px' },
{ title: '货主名称', index: 'shipperName', className: 'text-center', width: '180px' },
{ title: '货主纳税人识别号', index: 'shipperProvinceCode', className: 'text-center', width: '180px' },
{ title: '录单时间', index: 'recordTime', className: 'text-center', width: '250px' },
{ title: '录单时间', index: 'billCreateTime', className: 'text-center', width: '250px' },
{ title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' },
{ title: '发车时间', index: 'loadTime', className: 'text-center', width: '200px' },
{ title: '到车时间', index: 'unloadTime', className: 'text-center', width: '150px' },