新增提现记录
This commit is contained in:
潘晓云
@ -5,7 +5,7 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
|
||||
import { AccountManagemantService } from '../../services/account-managemant.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-partner-account-detail',
|
||||
selector: 'app-partner-account-management-account-detail',
|
||||
templateUrl: './account-detail.component.html',
|
||||
styleUrls: ['./account-detail.component.less']
|
||||
})
|
||||
|
||||
@ -8,7 +8,7 @@ import { AccountManagemantService } from '../../services/account-managemant.serv
|
||||
import { PartnerAccountManagementVirtualAccountDetailComponent } from '../virtual-account-detail/virtual-account-detail.component';
|
||||
|
||||
@Component({
|
||||
selector: 'app-partner-list',
|
||||
selector: 'app-partner-account-management-list',
|
||||
templateUrl: './list.component.html',
|
||||
})
|
||||
export class PartnerAccountManagementListComponent implements OnInit {
|
||||
|
||||
@ -6,7 +6,7 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
|
||||
import { AccountManagemantService } from '../../services/account-managemant.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-partner-recorded-detail',
|
||||
selector: 'app-partner-account-management-recorded-detail',
|
||||
templateUrl: './recorded-detail.component.html',
|
||||
})
|
||||
export class PartnerAccountManagementRecordedDetailComponent implements OnInit {
|
||||
|
||||
@ -7,7 +7,7 @@ import { ShipperBaseService } from 'src/app/shared/services/business/shipper-bas
|
||||
import { AccountManagemantService } from '../../services/account-managemant.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-partner-virtual-account-detail',
|
||||
selector: 'app-partner-account-management-virtual-account-detail',
|
||||
templateUrl: './virtual-account-detail.component.html',
|
||||
})
|
||||
export class PartnerAccountManagementVirtualAccountDetailComponent implements OnInit {
|
||||
|
||||
@ -0,0 +1,63 @@
|
||||
<!--
|
||||
* @Description :
|
||||
* @Version : 1.0
|
||||
* @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
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
-->
|
||||
<page-header-wrapper [title]="'提现详情'" [logo]="logo">
|
||||
<ng-template #logo>
|
||||
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
|
||||
<i nz-icon nzType="left" nzTheme="outline"></i>
|
||||
</button>
|
||||
</ng-template>
|
||||
</page-header-wrapper>
|
||||
|
||||
<nz-card>
|
||||
<nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
|
||||
<div se-container [labelWidth]="100">
|
||||
<se label="网络货运人">
|
||||
{{formData?.ltdName}}
|
||||
</se>
|
||||
<se label="银行类型">
|
||||
{{formData?.bankType==='1'?'平安银行':'浦发银行'}}
|
||||
</se>
|
||||
<se label="提现单号">
|
||||
{{formData?.refundApplyCode}}
|
||||
</se>
|
||||
<se label="账户名称">
|
||||
{{formData?.bankAccountName}}
|
||||
</se>
|
||||
<se label="提现时间">
|
||||
{{formData?.createTime}}
|
||||
</se>
|
||||
<se label="虚拟账户">
|
||||
{{formData?.virtualAccount}}
|
||||
</se>
|
||||
<se label="提现状态">
|
||||
{{formData?.refundStatusLabel}}
|
||||
</se>
|
||||
<se label="提现金额">
|
||||
{{formData?.amount}}
|
||||
</se>
|
||||
<se label="银行流水号">
|
||||
{{formData?.bankSerialNumber}}
|
||||
</se>
|
||||
<se label="提现至银行卡">
|
||||
{{formData?.bankId}}
|
||||
</se>
|
||||
<se label="银行回单" col="1">
|
||||
<img [src]="formData?.bankCardNumber" alt="" style="width: 200px;height: 160px;">
|
||||
</se>
|
||||
</div>
|
||||
|
||||
<nz-alert nzType="info" nzMessage="提现进度" class="mb-md mt-md"></nz-alert>
|
||||
<div nz-row class="mt-xl">
|
||||
<div nz-col nzSpan="12" nzOffset="1">
|
||||
<app-logistics-time-line [data]="timeLineData"></app-logistics-time-line>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
@ -0,0 +1,17 @@
|
||||
:host::ng-deep {
|
||||
|
||||
.ant-alert-info {
|
||||
background-color: #f3f3f3;
|
||||
border : 1px solid #dbdbdb;
|
||||
|
||||
.ant-alert-message {
|
||||
color: rgba(0, 0, 0, 0.85);
|
||||
font-weight: 600;
|
||||
font-size: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
.ant-form-item {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,73 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-partner-account-management-withdrawals-detail',
|
||||
templateUrl: './withdrawals-detail.component.html',
|
||||
styleUrls: ['./withdrawals-detail.component.less']
|
||||
})
|
||||
export class PartnerAccountManagementWithdrawalsDetailComponent implements OnInit {
|
||||
formData: any = {};
|
||||
|
||||
timeLineData: any = [];
|
||||
|
||||
constructor(public service: FreightAccountService, private route: ActivatedRoute) {
|
||||
const id = route.snapshot.params.id;
|
||||
this.loadRefundDetail(id);
|
||||
}
|
||||
|
||||
ngOnInit(): void { }
|
||||
|
||||
loadRefundDetail(id: string) {
|
||||
this.service.request(this.service.$api_get_refund_detail, { id }).subscribe(res => {
|
||||
if (res) {
|
||||
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';
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
goBack() {
|
||||
history.go(-1);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,85 @@
|
||||
<page-header-wrapper [title]="'提现记录'">
|
||||
</page-header-wrapper>
|
||||
|
||||
<!-- <nz-card>
|
||||
<nz-row [nzGutter]="16">
|
||||
<nz-col [nzXl]="6" [nzLg]="6" [nzSm]="12">
|
||||
<nz-statistic nzValue="100 笔" [nzTitle]="'待审核订单数'" [nzValueStyle]="{'font-size':'21px'}">
|
||||
</nz-statistic>
|
||||
</nz-col>
|
||||
<nz-col [nzXl]="6" [nzLg]="6" [nzSm]="12">
|
||||
<nz-statistic nzValue="80000.00 元" [nzTitle]="'待审核提现金额'" [nzValueStyle]="{'font-size':'21px'}">
|
||||
</nz-statistic>
|
||||
</nz-col>
|
||||
<nz-col [nzXl]="6" [nzLg]="6" [nzSm]="12">
|
||||
<nz-statistic nzValue="100 笔" [nzTitle]="'已提现订单数'" [nzValueStyle]="{'font-size':'21px'}">
|
||||
</nz-statistic>
|
||||
</nz-col>
|
||||
<nz-col [nzXl]="6" [nzLg]="6" [nzSm]="12">
|
||||
<nz-statistic nzValue="80000.00 元" [nzTitle]="'已提现金额'" [nzValueStyle]="{'font-size':'21px'}">
|
||||
</nz-statistic>
|
||||
</nz-col>
|
||||
</nz-row>
|
||||
</nz-card> -->
|
||||
|
||||
<nz-card class="search-box" nzBordered>
|
||||
<div nz-row nzGutter="8">
|
||||
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
|
||||
<sf #sf [schema]="searchSchema"
|
||||
[ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24,gutter:15 } }}" [compact]="true"
|
||||
[button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
|
||||
class="text-right">
|
||||
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
|
||||
<button nz-button (click)="resetSF()">重置</button>
|
||||
<button nz-button> 导出</button>
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
{{ !_$expand ? '展开' : '收起' }}
|
||||
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card class="content-box" nzBordered>
|
||||
<nz-tabset [nzTabBarExtraContent]="extraTemplate">
|
||||
<nz-tab nzTitle="全部" (nzClick)="changeRefundStatus()"></nz-tab>
|
||||
<nz-tab nzTitle="待审核" (nzClick)="changeRefundStatus('1')"></nz-tab>
|
||||
<nz-tab nzTitle="处理中" (nzClick)="changeRefundStatus('2')"></nz-tab>
|
||||
<nz-tab nzTitle="提现成功" (nzClick)="changeRefundStatus('3')"></nz-tab>
|
||||
<nz-tab nzTitle="提现失败" (nzClick)="changeRefundStatus('5')"></nz-tab>
|
||||
<nz-tab nzTitle="已拒绝" (nzClick)="changeRefundStatus('4')"></nz-tab>
|
||||
</nz-tabset>
|
||||
|
||||
<ng-template #extraTemplate>
|
||||
<div class="d-flex align-items-center ">
|
||||
<div class="mr-md">
|
||||
已选择
|
||||
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据 累计提现 <strong
|
||||
class="text-red">{{
|
||||
totalCallNo }}</strong>
|
||||
<a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
|
||||
</div>
|
||||
<button nz-button (click)="this.auditAction(null)">审核</button>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
<st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{ process: beforeReq }"
|
||||
[loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
|
||||
<ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
|
||||
{{ item.bankName }} <br> {{ item.bankCardNumber }}
|
||||
</ng-template>
|
||||
</st>
|
||||
</nz-card>
|
||||
|
||||
<ng-template #auditModal>
|
||||
<div nz-row nzGutter="8">
|
||||
<div nz-col nzSpan="24" se-container [labelWidth]="80">
|
||||
<se [col]="1" label="备注">
|
||||
<textarea nz-input rows="3" [(ngModel)]="msg" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
|
||||
style="width: 325px;margin-left: 14px;"></textarea>
|
||||
</se>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
@ -0,0 +1,294 @@
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { Router } from '@angular/router';
|
||||
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
|
||||
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service';
|
||||
|
||||
|
||||
@Component({
|
||||
selector: 'app-partner-account-management-withdrawals-record',
|
||||
templateUrl: './withdrawals-record.component.html',
|
||||
styleUrls: ['../../../../commom/less/box.less', '../../../../commom/less/expend-but.less']
|
||||
})
|
||||
export class PartnerAccountManagementWithdrawalsRecordComponent implements OnInit {
|
||||
@ViewChild('st', { static: true })
|
||||
st!: STComponent;
|
||||
@ViewChild('sf', { static: false })
|
||||
sf!: SFComponent;
|
||||
@ViewChild('auditModal', { static: false })
|
||||
auditModal!: any;
|
||||
columns: STColumn[] = this.initST();
|
||||
searchSchema: SFSchema = this.initSF();
|
||||
|
||||
_$expand = false;
|
||||
|
||||
selectedRows: any[] = [];
|
||||
totalCallNo = 0;
|
||||
refundStatus: any = '';
|
||||
|
||||
msg = '';
|
||||
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) { }
|
||||
|
||||
ngOnInit(): void { }
|
||||
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value,
|
||||
createTime: {
|
||||
start: this.sf.value.createTime?.[0] || '',
|
||||
end: this.sf.value.createTime?.[1] || ''
|
||||
},
|
||||
refundStatus: this.refundStatus || null
|
||||
});
|
||||
}
|
||||
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':
|
||||
this.selectedRows = e.checkbox!;
|
||||
this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.amount, 0).toFixed(2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
changeRefundStatus(status?: string) {
|
||||
this.refundStatus = status || null;
|
||||
this.st.load(1);
|
||||
}
|
||||
|
||||
auditAction(item?: any) {
|
||||
this.msg = '';
|
||||
let params: Array<string> = [];
|
||||
if (item) {
|
||||
params = [item.id];
|
||||
} else {
|
||||
params = this.selectedRows.map(node => node.id);
|
||||
}
|
||||
const modal = this.nzModalService.create({
|
||||
nzTitle: '审核',
|
||||
nzContent: this.auditModal,
|
||||
nzFooter: [
|
||||
{
|
||||
label: '拒绝',
|
||||
type: 'default',
|
||||
onClick: () => {
|
||||
this.service
|
||||
.request(this.service.$api_disagree_refund, {
|
||||
refundApplicationId: params,
|
||||
msg: this.msg
|
||||
})
|
||||
.subscribe(res => {
|
||||
if (res) {
|
||||
this.service.msgSrv.success('审核拒绝成功');
|
||||
modal.destroy();
|
||||
this.st.load(1);
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
{
|
||||
label: '通过',
|
||||
type: 'primary',
|
||||
onClick: () => {
|
||||
this.service
|
||||
.request(this.service.$api_agree_refund, {
|
||||
refundApplicationId: params,
|
||||
msg: this.msg
|
||||
})
|
||||
.subscribe(res => {
|
||||
if (res) {
|
||||
this.service.msgSrv.success('审核通过成功');
|
||||
modal.destroy();
|
||||
this.st.load(1);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
]
|
||||
});
|
||||
modal.afterClose.subscribe(res => {
|
||||
this.st.load();
|
||||
});
|
||||
}
|
||||
|
||||
showReason(item: any) {
|
||||
const modal = this.nzModalService.create({
|
||||
nzTitle: '查看原因',
|
||||
nzContent: '运单数据异常，暂时无法开票，请联系客服400-xxxx-xxxx',
|
||||
nzFooter: [
|
||||
{
|
||||
label: '关闭',
|
||||
type: 'primary',
|
||||
onClick: () => {
|
||||
modal.destroy();
|
||||
}
|
||||
}
|
||||
]
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 重置表单
|
||||
*/
|
||||
resetSF() {
|
||||
this.sf.reset();
|
||||
this._$expand = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 伸缩查询条件
|
||||
*/
|
||||
expandToggle() {
|
||||
this._$expand = !this._$expand;
|
||||
this.sf?.setValue('/expand', this._$expand);
|
||||
}
|
||||
|
||||
private initSF(): SFSchema {
|
||||
return {
|
||||
properties: {
|
||||
expand: {
|
||||
type: 'boolean',
|
||||
ui: {
|
||||
hidden: true
|
||||
}
|
||||
},
|
||||
refundApplyCode: {
|
||||
type: 'string',
|
||||
title: '提现单号',
|
||||
ui: {
|
||||
placeholder: '请输入'
|
||||
}
|
||||
},
|
||||
refundStatus: {
|
||||
type: 'string',
|
||||
title: '提现状态',
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'refund:apply:status' },
|
||||
placeholder: '请选择'
|
||||
}
|
||||
},
|
||||
createTime: {
|
||||
title: '提现时间',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'sl-from-to-search',
|
||||
format: 'yyyy-MM-dd',
|
||||
placeholder: '请选择',
|
||||
nzShowTime: true
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
bankAccountName: {
|
||||
type: 'string',
|
||||
title: '账户名称',
|
||||
ui: {
|
||||
placeholder: '请输入',
|
||||
visibleIf: {
|
||||
expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
accountType: {
|
||||
type: 'string',
|
||||
title: '账户类型',
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'bank:type' },
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
ltdId: {
|
||||
type: 'string',
|
||||
title: '网络货运人',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
allowClear: true,
|
||||
asyncData: () => this.service.getNetworkFreightForwarder(),
|
||||
visibleIf: {
|
||||
expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
bankType: {
|
||||
type: 'string',
|
||||
title: '银行类型',
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'bankname:type' },
|
||||
placeholder: '请输入',
|
||||
visibleIf: {
|
||||
expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private initST(): STColumn[] {
|
||||
return [
|
||||
{ title: '', index: 'key', type: 'checkbox' },
|
||||
{ title: '提现时间', index: 'createTime', width: 180 },
|
||||
{ title: '提现单号', index: 'refundApplyCode', width: 120 },
|
||||
{ title: '网络货运人', index: 'ltdName', width: 140 },
|
||||
{ title: '银行类型', index: 'bankTypeLabel', width: 100 },
|
||||
{ title: '账户类型', index: 'bankTypeLabel', width: 100 },
|
||||
{ title: '账户名称', index: 'bankAccountName', width: 140 },
|
||||
{ title: '虚拟账户', index: 'virtualAccount', width: 100 },
|
||||
{
|
||||
title: '提现金额',
|
||||
index: 'amount',
|
||||
width: 120,
|
||||
type: 'widget',
|
||||
className: 'text-right',
|
||||
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
|
||||
},
|
||||
{ title: '提现银行账户', render: 'bankCardNumber', width: 180 },
|
||||
{ title: '提现状态', index: 'refundStatusLabel', width: 100 },
|
||||
{ title: '银行流水号', index: 'bankSerialNumber', width: 120 },
|
||||
{ title: '核心交易流水', index: 'coreSerNo', width: 120 },
|
||||
{ title: '失败原因', index: 'rejectionCause', width: 150, format: item => item.failCause || item.rejectionCause },
|
||||
{
|
||||
title: '操作',
|
||||
fixed: 'right',
|
||||
width: '110px',
|
||||
buttons: [
|
||||
{
|
||||
text: '查看回单',
|
||||
iif: item => item.refundStatus === '3',
|
||||
click: item =>
|
||||
this.service.getReceiptUrl(item.receiptUrl, {
|
||||
bankType: item.bankType,
|
||||
rmYll: item.userId,
|
||||
snglFlgCd: item.coreSerNo,
|
||||
bussType: '06',
|
||||
ltdId: item.ltdId
|
||||
})
|
||||
},
|
||||
{
|
||||
text: '审核',
|
||||
iif: item => item.refundStatus === '1',
|
||||
click: item => this.auditAction(item)
|
||||
},
|
||||
{
|
||||
text: '详情',
|
||||
click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/' + item.id])
|
||||
}
|
||||
]
|
||||
}
|
||||
];
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user