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

edit

Browse Source
This commit is contained in:
Taric Xin
2021-12-30 09:34:49 +08:00
parent 9b27cfe76b
commit 9270ece824
4 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/financial-management/components/recharge-record/recharge-record.component.less
View File

@ -14,6 +14,10 @@
nz-range-picker {
width: 100%;
}
.text-truncate {
white-space: normal;
}
}
.expend-options {

27
src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
View File

@ -157,20 +157,23 @@ export class RechargeRecordComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '充值时间', index: 'createTime', type: 'date' },
{ title: '充值单号', index: 'rechargeNo' },
{ title: '网络货运人', index: 'ltdName' },
{ title: '银行类型', index: 'bankTypeLabel' },
{ title: '账户类型', index: 'accountTypeLabel' },
{ title: '账户名称', index: 'rechargeName' },
{ title: '虚拟账户', index: 'virtualAccount' },
{ title: '充值金额', index: 'rechargeAmount' },
{ title: '充值银行账户', render: 'transferBankAccount' },
{ title: '充值方式', index: 'payChannelLabel' },
{ title: '充值状态', index: 'rechargeStatusLabel' },
{ title: '银行流水号', index: 'paySerialNumber' },
{ title: '充值时间', index: 'createTime', type: 'date', width: 180 },
{ title: '充值单号', index: 'rechargeNo', width: 120 },
{ title: '网络货运人', index: 'ltdName', width: 120 },
{ title: '银行类型', index: 'bankTypeLabel', width: 100 },
{ title: '账户类型', index: 'accountTypeLabel', width: 100 },
{ title: '账户名称', index: 'rechargeName', width: 100 },
{ title: '虚拟账户', index: 'virtualAccount', width: 100 },
{ title: '充值金额', index: 'rechargeAmount', width: 100 },
{ title: '充值银行账户', render: 'transferBankAccount', width: 140 },
{ title: '充值方式', index: 'payChannelLabel', width: 100 },
{ title: '充值状态', index: 'rechargeStatusLabel', width: 100 },
{ title: '银行流水号', index: 'paySerialNumber', width: 120 },
{
title: '操作',
width: 100,
fixed: 'right',
className: 'text-center',
buttons: [
{
text: '查看回单'

6
src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts
View File

@ -206,11 +206,11 @@ export class TransactionFlowComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '交易时间', index: 'createTime', width: 150 },
{ title: '交易时间', index: 'createTime', width: 180 },
{ title: '流水号', index: 'transactionNumber', width: 150 },
{ title: '交易类型', index: 'tradeTypeLabel', width: 100 },
{ title: '交易类型', index: 'tradeTypeLabel', width: 120 },
{ title: '关联单号', index: 'businessNumber', width: 150 },
{ title: '账户类型', index: 'channelSource', width: 100, enum: { 1: '货主端', 2: '司机端', 3: '运营平台' } },
{ title: '账户类型', index: 'accountTypeLabel', width: 100 },
{ title: '账户名称', index: 'driverName', width: 100 },
{ title: '所属项目', index: 'projectName', width: 100 },
{ title: '收支类型', index: 'incomeTypeLabel', width: 100 },

35
src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
View File

@ -31,27 +31,44 @@ export class WithdrawalsDetailComponent implements OnInit {
this.service.request(this.service.$api_get_refund_detail, { id }).subscribe(res => {
if (res) {
this.formData = res;
// 处理流程节点数据
// 流程是否结束
let isEnd = false;
if (res.successTime) {
this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' });
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) {
if (res.agreeTime && res.refundStatus !== '4') {
this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
}
if (res.agreeTime) {
this.timeLineData.push({
time: res.agreeTime,
value: `审核通过<br/>操作人员：${res.bankAccountName}`,
color: 'gray'
});
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.bankAccountName}`,
value: `提交提现申请<br/>提现${res.amount}元至${res.bankName}(${res.bankCardNumber})<br/>操作人员：${res.userIdLabel}`,
color: 'gray'
});
}
if (this.timeLineData?.length > 0) {
if (this.timeLineData?.length > 0 && !isEnd) {
this.timeLineData[0].color = 'green';
}
}