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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-04-14 16:20:00 +08:00
parent 67ca5f4cb3 503f68fec8
commit dd3dd6ff4f
8 changed files with 126 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.html Normal file
View File

@ -0,0 +1,55 @@
<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 [nzLoading]="service.http.loading">
<div se-container [labelWidth]="130">
<se label="网络货运人">
{{formData?.ltdName}}
</se>
<se label="银行类型">
{{formData?.bankTypeLabel}}
</se>
<se label="资金总账号">
{{formData?.virtualAccount}}
</se>
<se label="付款账户">
{{formData?.transferBankAccount}}
</se>
<se label="入金金额">
{{formData?.rechargeAmount | currency}}
</se>
<se label="付款银行">
{{formData?.transferBankOpenName}}
</se>
<se label="入金状态">
{{formData?.rechargeStatusLabel}}
</se>
<se label="备注">
{{formData?.rechargeRemark}}
</se>
<se label="入金时间">
{{formData?.createTime}}
</se>
<se label="退款时间">
{{formData?.refundTime}}
</se>
<se label="入金流水号">
{{formData?.paySerialNumber}}
</se>
<se label="退款流水号">
{{formData?.paySerialNumber2}}
</se>
<se label="入金回单">
<a (click)="downBack()">{{formData?.refundStatus==='3'?'查看回单':'暂无回单'}}</a>
</se>
<se label="退款回单">
<a (click)="downBack()">{{formData?.refundStatus==='3'?'查看回单':'暂无回单'}}</a>
</se>
</div>
</nz-card>

0
src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.less Normal file
View File

45
src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.ts Normal file
View File

@ -0,0 +1,45 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { FreightAccountService } from '../../../services/freight-account.service';
@Component({
selector: 'app-abnormal-gold-detail',
templateUrl: './abnormal-gold-detail.component.html',
styleUrls: ['./abnormal-gold-detail.component.less']
})
export class AbnormalGoldDetailComponent implements OnInit {
formData: 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_getAbnormalAmount_detail, { id }).subscribe(res => {
if (res) {
this.formData = res;
}
});
}
downBack() {
if (this.formData?.refundStatus !== '3') {
return;
}
this.service.getReceiptUrl(this.formData.receiptUrl, {
bankType: this.formData.bankType,
rmYll: this.formData.userId,
snglFlgCd: this.formData.coreSerNo,
bussType: '06',
ltdId: this.formData.ltdId,
accountType: this.formData.accountType
});
}
goBack() {
history.go(-1);
}
}

8
src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html
View File

@ -16,7 +16,7 @@
<sf
#sf
[schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 90, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
[ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
[compact]="true"
[button]="'none'"
></sf>
@ -35,9 +35,9 @@
<nz-card class="content-box" nzBordered>
<nz-tabset>
<nz-tab nzTitle="待处理"></nz-tab>
<nz-tab nzTitle="已退款"></nz-tab>
<nz-tab nzTitle="全部"></nz-tab>
<nz-tab nzTitle="处理中"(nzClick)="changePaymentStatus('1')"></nz-tab>
<nz-tab nzTitle="已退款"(nzClick)="changePaymentStatus('5')"></nz-tab>
<nz-tab nzTitle="全部"(nzClick)="changePaymentStatus('')"></nz-tab>
</nz-tabset>
<st

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

@ -21,17 +21,24 @@ export class AbnormalGoldComponent implements OnInit {
_$expand = false;
rechargeStatus = '1';
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
ngOnInit(): void {}
beforeReq = (requestOptions: STRequestOptions) => {
Object.assign(requestOptions.body, { rechargeStatus: this.rechargeStatus });
if (this.sf) {
Object.assign(requestOptions.body, { ...this.sf.value });
}
return requestOptions;
};
changePaymentStatus(status: string) {
this.rechargeStatus = status;
this.st.load(1);
}
refund(item: any) {
this.nzModalService.warning({
nzTitle: '确定要将该笔款项原路退回？',
@ -169,11 +176,12 @@ export class AbnormalGoldComponent implements OnInit {
{ title: '付款账户', index: 'transferBankAccount', width: 180 },
{ title: '付款账号', index: 'transferBankCardNumber', width: 180 },
{ title: '付款银行', index: 'transferBankOpenName', width: 220 },
{ title: '转账时间', index: 'transferDate', type: 'date', width: 150 },
{ title: '转账备注', index: 'remark', width: 100 },
{ title: '操作人', index: 'rechargeName', width: 140 },
{ title: '操作时间', index: 'callNo', type: 'date', width: 160 },
{ title: '状态', index: 'callNo', width: 90 },
{ title: '转账时间', index: 'createTime', type: 'date', width: 150 },
{ title: '转账备注', index: 'rechargeRemark', width: 180 },
{ title: '退款时间', index: 'refundTime', type: 'date', width: 150 },
// { title: '操作人', index: 'rechargeName', width: 140 },
// { title: '操作时间', index: 'callNo', type: 'date', width: 160 },
{ title: '状态', index: 'rechargeStatusLabel', width: 110 },
{
title: '操作',
fixed: 'right',
@ -182,7 +190,7 @@ export class AbnormalGoldComponent implements OnInit {
buttons: [
{
text: '查看',
click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/1'])
click: item => this.router.navigate(['/financial-management/abnormal-gold/detail/' + item.id])
}
]
}

2
src/app/routes/financial-management/financial-managemen-routing.module.ts
View File

@ -32,6 +32,7 @@ import { PlatformAccountDetailComponent } from './components/platform-account/pl
import { AdvanceCollectionComponent } from './components/advance-collection/advance-collection.component';
import { AdvanceCollectionDetailComponent } from './components/advance-collection/advance-collection-detail/advance-collection-detail.component';
import { RefundRecordComponent } from './components/refund-record/refund-record.component';
import { AbnormalGoldDetailComponent } from './components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component';
const routes: Routes = [
{ path: 'freight-account', component: FreightAccountComponent, data: { guard: { ability: ['FINANCIAL-FREIGHT-ACOUNT-list'] } } },
@ -55,6 +56,7 @@ const routes: Routes = [
{ path: 'cost-management/expenses-receivable/:id', component: ExpensesReceivableComponent },
{ path: 'cost-management/expenses-payable/:id', component: ExpensesPayableComponent },
{ path: 'abnormal-gold', component: AbnormalGoldComponent },
{ path: 'abnormal-gold/detail/:id', component: AbnormalGoldDetailComponent },
{ path: 'payment-record', component: PaymentRecordComponent },
{ path: 'transaction-flow', component: TransactionFlowComponent },
{ path: 'payment-order', component: PaymentOrderComponent },

4
src/app/routes/financial-management/financial-management.module.ts
View File

@ -35,6 +35,7 @@ import { PlatformAccountDetailComponent } from './components/platform-account/pl
import { AdvanceCollectionComponent } from './components/advance-collection/advance-collection.component';
import { AdvanceCollectionDetailComponent } from './components/advance-collection/advance-collection-detail/advance-collection-detail.component';
import { RefundRecordComponent } from './components/refund-record/refund-record.component';
import { AbnormalGoldDetailComponent } from './components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component';
const ROUTESCOMPONENTS = [
FreightAccountComponent,
@ -66,7 +67,8 @@ const ROUTESCOMPONENTS = [
ReceiptOrderDetailComponent,
AdvanceCollectionComponent,
AdvanceCollectionDetailComponent,
RefundRecordComponent
RefundRecordComponent,
AbnormalGoldDetailComponent
];
const NOTROUTECOMPONENTS = [DriverAccountDetailComponent, FreightAccountDetailComponent, ClearingModalComponent];

3
src/app/routes/financial-management/services/freight-account.service.ts
View File

@ -156,6 +156,9 @@ export class FreightAccountService extends ShipperBaseService {
// 查询异常入金充值信息
$api_get_getAbnormalAmountPage = '/api/fcc/rechargeInfo/list/getAbnormalAmountPage';
// 查询异常入金充值信息详情
$api_get_getAbnormalAmount_detail = '/api/fcc/rechargeInfo/get';
// 异步导出运营后台异常入金列表
$api_get_exportAbnormalAmountPage = '/api/fcc/rechargeInfo/exportAbnormalAmountPage';
// 异步导出运营后台退款记录列表