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-29 19:46:29 +08:00
parent f6f17a410d
commit a99a15e570
20 changed files with 425 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts
View File

@ -83,7 +83,7 @@ export class AbnormalGoldComponent implements OnInit {
placeholder: '请输入'
}
},
ltdid: {
ltdId: {
type: 'string',
title: '网络货运人',
ui: {
@ -157,7 +157,7 @@ export class AbnormalGoldComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '银行流水号', index: 'paySerialNumber', width: 150 },
{ title: '网络货运人', index: 'ltdid', width: 120 },
{ title: '网络货运人', index: 'ltdId', width: 120 },
{ title: '银行类型', index: 'callNo', width: 100, type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
{ title: '资金总账号', index: 'callNo', width: 120 },
{ title: '充值金额', index: 'rechargeAmount', width: 100 },

55
src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts
View File

@ -32,24 +32,28 @@ export class DriverAccountDetailComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
Object.assign(requestOptions.body, {
ltdid: this.params.ltdid,
ltdId: this.params.ltdId,
projectId: this.params.projectId,
enterpriseId: this.params.enterpriseId,
roleId: this.params.roleId
});
if (this.sf) {
Object.assign(requestOptions.body, { ...this.sf.value });
Object.assign(requestOptions.body, {
...this.sf.value,
createTime: {
start: this.sf.value?.createTime?.[0] || null,
end: this.sf.value?.createTime?.[1] || null
}
});
}
return requestOptions;
};
loadInfo() {
console.log(1);
this.service
.request(this.service.$api_get_driver_account_balance_detail, {
...this.sf?.value,
ltdid: this.params.ltdid,
ltdId: this.params.ltdId,
projectId: this.params.projectId,
enterpriseId: this.params.enterpriseId,
roleId: this.params.roleId,
@ -114,33 +118,26 @@ export class DriverAccountDetailComponent implements OnInit {
nzShowTime: true
} as SFDateWidgetSchema
},
orderSn2: {
transactionNumber: {
type: 'string',
title: '流水号',
ui: {
placeholder: '请输入'
}
},
orderSn3: {
businessNumber: {
type: 'string',
title: '关联单号',
ui: {
placeholder: '请输入'
}
},
receiveName: {
tradeType: {
type: 'string',
title: '交易类型',
enum: [
{ label: '全部', value: '' },
{ label: '订单支付', value: '订单支付' },
{ label: '余额充值', value: '余额充值' },
{ label: '余额提现', value: '余额提现' },
{ label: '资金分配', value: '资金分配' },
{ label: '资金回收', value: '资金回收' }
],
ui: {
widget: 'select',
widget: 'dict-select',
params: { dictKey: 'trade:type' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
@ -148,16 +145,12 @@ export class DriverAccountDetailComponent implements OnInit {
},
default: ''
},
receiveName2: {
incomeType: {
type: 'string',
title: '收支类型',
enum: [
{ label: '全部', value: '' },
{ label: '收入', value: '收入' },
{ label: '支出', value: '支出' }
],
ui: {
widget: 'select',
widget: 'dict-select',
params: { dictKey: 'income:type' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
@ -171,13 +164,13 @@ export class DriverAccountDetailComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '交易时间', index: 'updatedAt', type: 'date' },
{ title: '流水号', index: 'callNo' },
{ title: '交易类型', index: 'callNo' },
{ title: '关联单号', index: 'callNo' },
{ title: '收支类型', index: 'callNo' },
{ title: '交易金额', index: 'callNo' },
{ title: '账户余额', index: 'callNo' }
{ title: '交易时间', index: 'createTime', type: 'date' },
{ title: '流水号', index: 'channelPaySn' },
{ title: '交易类型', index: 'tradeTypeLabel' },
{ title: '关联单号', index: 'businessNumber' },
{ title: '收支类型', index: 'incomeTypeLabel' },
{ title: '交易金额', index: 'amount' },
{ title: '账户余额', index: 'accountBalance' }
];
}
}

6
src/app/routes/financial-management/components/driver-account/driver-account.component.ts
View File

@ -78,7 +78,7 @@ export class DriverAccountComponent implements OnInit {
placeholder: '请输入'
}
},
ltdid: {
ltdId: {
type: 'string',
title: '网络货运人',
ui: {
@ -144,7 +144,7 @@ export class DriverAccountComponent implements OnInit {
{ title: '证件号码', index: 'idNo' },
{ title: '手机号', index: 'phone' },
{ title: '网络货运人', index: 'ltdName' },
{ title: '银行类型', index: 'bankType', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
{ title: '银行类型', index: 'bankTypeLabel' },
{ title: '虚拟账户', index: 'virtualAccount' },
{ title: '可用余额', index: 'availableBalance' },
{ title: '冻结余额', index: 'freezeBalance' },
@ -167,7 +167,7 @@ export class DriverAccountComponent implements OnInit {
availableBalance: item.availableBalance,
enterpriseId: item.enterpriseId,
roleId: item.roleId,
ltdid: item.ltdid
ltdId: item.ltdId
}
})
}

15
src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
View File

@ -32,7 +32,7 @@ export class FreightAccountDetailComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
Object.assign(requestOptions.body, {
ltdid: this.params.ltdid,
ltdId: this.params.ltdId,
projectId: this.params.projectId,
enterpriseId: this.params.enterpriseId,
roleId: this.params.roleId
@ -53,7 +53,7 @@ export class FreightAccountDetailComponent implements OnInit {
this.service
.request(this.service.$api_get_shipper_account_balance_detail, {
...this.sf?.value,
ltdid: this.params.ltdid,
ltdId: this.params.ltdId,
projectId: this.params.projectId,
enterpriseId: this.params.enterpriseId,
roleId: this.params.roleId,
@ -188,17 +188,12 @@ export class FreightAccountDetailComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '交易时间', index: 'updatedAt', type: 'date' },
{ title: '交易时间', index: 'createTime', type: 'date' },
{ title: '流水号', index: 'transactionNumber' },
{
title: '交易类型',
index: 'tradeType',
type: 'enum',
enum: { 1: '整车订单退款', 2: '整车订单支付', 3: '提现失败退回', 4: '提现', 5: '充值', 6: '运货订单结算' }
},
{ title: '交易类型', index: 'tradeTypeLabel' },
{ title: '关联单号', index: 'businessNumber' },
{ title: '所属项目', index: 'projectId' },
{ title: '收支类型', index: 'incomeType', type: 'enum', enum: { 1: '收入', 2: '支出' } },
{ title: '收支类型', index: 'incomeTypeLabel' },
{ title: '交易金额', index: 'amount' },
{ title: '账户余额', index: 'accountBalance' }
];

6
src/app/routes/financial-management/components/freight-account/freight-account.component.ts
View File

@ -82,7 +82,7 @@ export class FreightAccountComponent implements OnInit {
placeholder: '请输入'
}
},
ltdid: {
ltdId: {
type: 'string',
title: '网络货运人',
ui: {
@ -144,7 +144,7 @@ export class FreightAccountComponent implements OnInit {
{ title: '联系人', index: 'name' },
{ title: '联系人电话', index: 'phone' },
{ title: '网络货运人', index: 'ltdName' },
{ title: '银行类型', index: 'bankType', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
{ title: '银行类型', index: 'bankTypeLabel' },
{ title: '虚拟账户', index: 'virtualAccount' },
{ title: '可用余额', index: 'availableBalance' },
{ title: '冻结余额', index: 'freezeBalance' },
@ -172,7 +172,7 @@ export class FreightAccountComponent implements OnInit {
projectId: item.projectId,
enterpriseId: item.enterpriseId,
roleId: item.roleId,
ltdid: item.ltdid
ltdId: item.ltdId
}
})
}

14
src/app/routes/financial-management/components/payment-record/payment-record.component.html
View File

@ -24,10 +24,10 @@
<nz-card class="content-box" nzBordered>
<nz-tabset>
<nz-tab nzTitle="全部" (nzClick)="changePaymentStatus()"></nz-tab>
<nz-tab nzTitle="支付中" (nzClick)="changePaymentStatus('3')"></nz-tab>
<nz-tab nzTitle="已支付" (nzClick)="changePaymentStatus('1')"></nz-tab>
<nz-tab nzTitle="支付失败" (nzClick)="changePaymentStatus('4')"></nz-tab>
<nz-tab nzTitle="全部" (nzClick)="changePaymentStatus()"></nz-tab>
<nz-tab nzTitle="支付中" (nzClick)="changePaymentStatus('4')"></nz-tab>
<nz-tab nzTitle="已支付" (nzClick)="changePaymentStatus('2')"></nz-tab>
<nz-tab nzTitle="支付失败" (nzClick)="changePaymentStatus('5')"></nz-tab>
</nz-tabset>
<st #st [data]="service.$api_get_order_payment_page" [columns]="columns"
@ -36,16 +36,16 @@
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }">
<ng-template st-row="orderPaymentCode" let-item let-index="index" let-column="column">
{{ item.orderPaymentCode }} <br> <a>{{ paymentStatusEm[item.paymentStatus] }}</a>
{{ item.orderPaymentCode }} <br> <a>{{ item.paymentStatusLabel }}</a>
</ng-template>
<ng-template st-row="amountDetails" let-item let-index="index" let-column="column">
预付:￥{{ item.price }}<br />附加费:￥ {{ item.surcharge }}
</ng-template>
<ng-template st-row="billCode" let-item let-index="index" let-column="column">
{{ item.billCode }} <br> {{billStatus[item.billStatus] }}
{{ item.billCode }} <br> {{item.billStatusLabel }}
</ng-template>
<ng-template st-row="wayBillCode" let-item let-index="index" let-column="column">
{{ item.wayBillCode }} <br> {{wayBillStatus[item.wayBillStatus ] }}
{{ item.wayBillCode }} <br> {{item.wayBillStatusLabel }}
</ng-template>
<ng-template st-row="driverId" let-item let-index="index" let-column="column">
{{ item.driverName }} <br> {{ item.driverTelephone }} <br> {{ item.driverLicensePlate }}

48
src/app/routes/financial-management/components/payment-record/payment-record.component.ts
View File

@ -23,30 +23,6 @@ export class PaymentRecordComponent implements OnInit {
paymentStatus: any = '';
paymentStatusEm: any = {
0: '待支付',
1: '已支付',
2: '已拒绝',
3: '支付中',
4: '支付失败'
};
billStatus: any = {
1: '待接单',
2: '待发车',
3: '运输中',
4: '待签收',
5: '已完成',
6: '已取消'
};
wayBillStatus: any = {
1: '待接单',
2: '待发车',
3: '运输中',
4: '待签收',
5: '已完成',
6: '已取消'
};
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
ngOnInit(): void {}
@ -56,14 +32,14 @@ export class PaymentRecordComponent implements OnInit {
Object.assign(requestOptions.body, {
...this.sf.value,
applyDate: {
start: this.sf.value.applyDate?.[0] || null,
end: this.sf.value.applyDate?.[1] || null
start: this.sf.value.applyDate?.[0] || '',
end: this.sf.value.applyDate?.[1] || ''
},
handlerDate: {
start: this.sf.value.handlerDate?.[0] || null,
end: this.sf.value.handlerDate?.[1] || null
start: this.sf.value.handlerDate?.[0] || '',
end: this.sf.value.handlerDate?.[1] || ''
},
paymentStatus: this.paymentStatus || ''
paymentStatus: this.paymentStatus || null
});
}
return requestOptions;
@ -243,7 +219,7 @@ export class PaymentRecordComponent implements OnInit {
},
default: ''
},
ltdid: {
ltdId: {
type: 'string',
title: '网络货运人',
ui: {
@ -280,10 +256,8 @@ export class PaymentRecordComponent implements OnInit {
},
{
title: '支付类型',
index: 'payType',
width: 130,
type: 'enum',
enum: { 1: '货主支付平台', 2: '平台支付司机', 3: '司机支付车队长' }
index: 'payTypeLabel',
width: 130
},
{ title: '货主', index: 'enterpriseInfoName', width: 100 },
{ title: '订单号', render: 'billCode', width: 120 },
@ -291,10 +265,8 @@ export class PaymentRecordComponent implements OnInit {
{ title: '货源编号', index: 'resourceCode', width: 120 },
{
title: '服务类型',
index: 'serviceType',
width: 150,
type: 'enum',
enum: { '1': '抢单', '2': '指派', '3': '二维码', '4': '手工单' }
index: 'serviceTypeLabel',
width: 150
},
{ title: '承运司机', render: 'driverId', width: 120 },
{ title: '收款人', render: 'captainName', width: 120 },

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

@ -121,7 +121,7 @@ export class RechargeRecordComponent implements OnInit {
},
default: ''
},
ltdid: {
ltdId: {
type: 'string',
title: '网络货运人',
ui: {
@ -159,7 +159,7 @@ export class RechargeRecordComponent implements OnInit {
return [
{ title: '充值时间', index: 'createTime', type: 'date' },
{ title: '充值单号', index: 'rechargeNo' },
{ title: '网络货运人', index: 'ltdid' },
{ title: '网络货运人', index: 'ltdId' },
{ title: '银行类型', index: 'bankType', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
{ title: '账户类型', index: 'accountType', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行', 3: '运营商账户' } },
{ title: '账户名称', index: 'rechargeName' },

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

@ -186,7 +186,7 @@ export class TransactionFlowComponent implements OnInit {
},
default: ''
},
ltdid: {
ltdId: {
type: 'string',
title: '网络货运人',
ui: {
@ -208,33 +208,16 @@ export class TransactionFlowComponent implements OnInit {
return [
{ title: '交易时间', index: 'createTime', width: 150 },
{ title: '流水号', index: 'transactionNumber', width: 150 },
{
title: '交易类型',
index: 'tradeType',
width: 100,
type: 'enum',
enum: {
1: '运费支付',
2: '附加费支付',
3: '运费退款',
4: '附加费退款',
5: '保费支付',
6: '保费退款',
7: '余额充值',
8: '余额提现',
9: '资金分配',
10: '资金回收'
}
},
{ title: '交易类型', index: 'tradeTypeLabel', width: 100 },
{ title: '关联单号', index: 'businessNumber', width: 150 },
{ title: '账户类型', index: 'channelSource', width: 100, enum: { 1: '货主端', 2: '司机端', 3: '运营平台' } },
{ title: '账户名称', index: 'driverName', width: 100 },
{ title: '所属项目', index: 'projectName', width: 100 },
{ title: '收支类型', index: 'incomeType', width: 100, type: 'enum', enum: { 1: '收入', 2: '支出' } },
{ title: '收支类型', index: 'incomeTypeLabel', width: 100 },
{ title: '交易金额', index: 'amount', width: 100 },
{ title: '账户余额', index: 'accountBalance', width: 100 },
{ title: '网络货运人', index: 'ltdName', width: 120 },
{ title: '银行类型', index: 'bankType', width: 100, type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
{ title: '银行类型', index: 'bankTypeLabel', width: 100 },
{ title: '银行流水号', index: 'channelPaySn', width: 120 },
{
title: '操作',

2
src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html
View File

@ -67,7 +67,7 @@
<st #st [data]="service.$api_get_refund_page" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
<ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">

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

@ -45,6 +45,11 @@ export class WithdrawalsRecordComponent implements OnInit {
return requestOptions;
};
afterRes = (data: any[], rawData?: any) => {
data = data.map(node => ({ ...node, disabled: node.refundStatus !== '1' }));
return data;
};
stChange(e: STChange): void {
switch (e.type) {
case 'checkbox':
@ -61,8 +66,11 @@ export class WithdrawalsRecordComponent implements OnInit {
auditAction(item?: any) {
this.msg = '';
if(!item){
let params: Array<string> = [];
if (item) {
params = [item.id];
} else {
params = this.selectedRows.map(node => node.id);
}
const modal = this.nzModalService.create({
nzTitle: '审核',
@ -74,13 +82,14 @@ export class WithdrawalsRecordComponent implements OnInit {
onClick: () => {
this.service
.request(this.service.$api_disagree_refund, {
refundApplicationId: item.id,
refundApplicationId: params,
msg: this.msg
})
.subscribe(res => {
if (res) {
this.service.msgSrv.success('审核拒绝成功');
modal.destroy();
this.st.load(1);
}
});
}
@ -91,13 +100,14 @@ export class WithdrawalsRecordComponent implements OnInit {
onClick: () => {
this.service
.request(this.service.$api_agree_refund, {
refundApplicationId: item.id,
refundApplicationId: params,
msg: this.msg
})
.subscribe(res => {
if (res) {
this.service.msgSrv.success('审核通过成功');
modal.destroy();
this.st.load(1);
}
});
}
@ -198,7 +208,7 @@ export class WithdrawalsRecordComponent implements OnInit {
}
}
},
ltdid: {
ltdId: {
type: 'string',
title: '网络货运人',
ui: {
@ -233,23 +243,18 @@ export class WithdrawalsRecordComponent implements OnInit {
{ title: '提现时间', index: 'createTime', width: 180 },
{ title: '提现单号', index: 'refundApplyCode', width: 120 },
{ title: '网络货运人', index: 'ltdname', width: 120 },
{ title: '银行类型', index: 'bankType', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' }, width: 100 },
{ title: '银行类型', index: 'bankTypeLabel', width: 100 },
{ title: '账户类型', index: 'callNo', width: 100 },
{ title: '账户名称', index: 'callNo', width: 100 },
{ title: '虚拟账户', index: 'virtualAccount', width: 100 },
{ title: '提现金额', index: 'amount', width: 100 },
{ title: '提现银行账户', render: 'bankCardNumber', width: 120 },
{
title: '提现状态',
index: 'refundStatus',
type: 'enum',
enum: { '1': '待审核', '2': '提现中', '3': '提现成功', '4': '拒绝提现', '5': '提现失败' },
width: 100
},
{ title: '提现状态', index: 'refundStatusLabel', width: 100 },
{ title: '银行流水号', index: 'bankSerialNumber', width: 120 },
{ title: '失败原因', index: 'failCause', width: 150 },
{
title: '操作',
width: 120,
buttons: [
{
text: '审核',