-
diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.less b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.less
index c5f2b1ea..cd8c3436 100644
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.less
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.less
@@ -19,6 +19,10 @@
padding-left : 16px;
padding-right: 16px;
}
+
+ .text-truncate {
+ white-space: normal;
+ }
}
.expend-options {
diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
index 9b33ca97..d82a0bd7 100644
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
@@ -24,13 +24,23 @@ export class WithdrawalsRecordComponent implements OnInit {
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 });
+ 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;
};
@@ -39,16 +49,21 @@ export class WithdrawalsRecordComponent implements OnInit {
switch (e.type) {
case 'checkbox':
this.selectedRows = e.checkbox!;
- this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.callNo, 0);
+ this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.amount, 0);
break;
}
}
- approval(): void {}
+ changeRefundStatus(status?: string) {
+ this.refundStatus = status || null;
+ this.st.load(1);
+ }
- add(): void {}
-
- auditAction(item: any) {
+ auditAction(item?: any) {
+ this.msg = '';
+ if(!item){
+
+ }
const modal = this.nzModalService.create({
nzTitle: '审核',
nzContent: this.auditModal,
@@ -57,14 +72,34 @@ export class WithdrawalsRecordComponent implements OnInit {
label: '拒绝',
type: 'default',
onClick: () => {
- modal.destroy();
+ this.service
+ .request(this.service.$api_disagree_refund, {
+ refundApplicationId: item.id,
+ msg: this.msg
+ })
+ .subscribe(res => {
+ if (res) {
+ this.service.msgSrv.success('审核拒绝成功');
+ modal.destroy();
+ }
+ });
}
},
{
label: '通过',
type: 'primary',
onClick: () => {
- modal.destroy();
+ this.service
+ .request(this.service.$api_agree_refund, {
+ refundApplicationId: item.id,
+ msg: this.msg
+ })
+ .subscribe(res => {
+ if (res) {
+ this.service.msgSrv.success('审核通过成功');
+ modal.destroy();
+ }
+ });
}
}
]
@@ -115,25 +150,19 @@ export class WithdrawalsRecordComponent implements OnInit {
hidden: true
}
},
- orderSn: {
+ refundApplyCode: {
type: 'string',
title: '提现单号',
ui: {
placeholder: '请输入'
}
},
- receiveName: {
+ refundStatus: {
type: 'string',
title: '提现状态',
- enum: [
- { label: '全部', value: '全部' },
- { label: '待审核', value: '待审核' },
- { label: '处理中', value: '处理中' },
- { label: '已完成', value: '已完成' },
- { label: '已拒绝', value: '已拒绝' }
- ],
ui: {
- widget: 'select',
+ widget: 'dict-select',
+ params: { dictKey: 'refund:apply:status' },
placeholder: '请选择'
}
},
@@ -141,12 +170,13 @@ export class WithdrawalsRecordComponent implements OnInit {
title: '提现时间',
type: 'string',
ui: {
- widget: 'date',
- mode: 'range',
- format: 'yyyy-MM-dd'
+ widget: 'sl-from-to-search',
+ format: 'yyyy-MM-dd',
+ placeholder: '请选择',
+ nzShowTime: true
} as SFDateWidgetSchema
},
- orderSn2: {
+ bankAccountName: {
type: 'string',
title: '账户名称',
ui: {
@@ -156,38 +186,37 @@ export class WithdrawalsRecordComponent implements OnInit {
}
}
},
- receiveName2: {
+ accountType: {
type: 'string',
title: '账户类型',
- enum: [
- { label: '全部', value: '全部' },
- { label: '货主账户', value: '货主账户' },
- { label: '司机账户', value: '司机账户' }
- ],
ui: {
- widget: 'select',
+ widget: 'dict-select',
+ params: { dictKey: 'bank:type' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
- receiveName3: {
+ ltdid: {
type: 'string',
title: '网络货运人',
- enum: [{ label: '全部', value: '全部' }],
ui: {
widget: 'select',
placeholder: '请选择',
+ allowClear: true,
+ asyncData: () => this.service.getNetworkFreightForwarder(),
visibleIf: {
expand: (value: boolean) => value
}
}
},
- orderSn23: {
+ bankType: {
type: 'string',
title: '银行类型',
ui: {
+ widget: 'dict-select',
+ params: { dictKey: 'bankname:type' },
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
@@ -201,32 +230,40 @@ export class WithdrawalsRecordComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox' },
- { title: '提现时间', index: 'no' },
- { title: '提现单号', index: 'callNo' },
- { title: '网络货运人', index: 'callNo' },
- { title: '银行类型', index: 'callNo' },
- { title: '账户类型', index: 'callNo' },
- { title: '账户名称', index: 'callNo' },
- { title: '虚拟账户', index: 'callNo' },
- { title: '提现金额', index: 'callNo' },
- { title: '提现银行账户', index: 'callNo' },
- { title: '提现状态', index: 'callNo' },
- { title: '银行流水号', index: 'callNo' },
- { title: '失败原因', index: 'callNo' },
+ { 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: '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: 'bankSerialNumber', width: 120 },
+ { title: '失败原因', index: 'failCause', width: 150 },
{
title: '操作',
buttons: [
{
text: '审核',
+ iif: item => item.refundStatus === '1',
click: item => this.auditAction(item)
},
{
- text: '查看回单'
+ text: '查看回单',
+ iif: item => item.refundStatus === '3'
// click: item => this.auditAction(item)
},
{
text: '详情',
- click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/1'])
+ click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/' + item.id])
}
]
}
diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts
index 197a9985..47f4ea06 100644
--- a/src/app/routes/financial-management/services/freight-account.service.ts
+++ b/src/app/routes/financial-management/services/freight-account.service.ts
@@ -13,7 +13,9 @@ export class FreightAccountService extends ShipperBaseService {
$api_get_driver_account_page = '/api/fcc/accountBalance/getDriverAccountBalanceByOperator';
// 运营端获取货主账户明细信息
- $api_get_shipper_or_driver_account_detail = '/api/fcc/accountBalance/getShipperAccountBalanceDetailByOperator';
+ $api_get_shipper_account_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceShipperByOperatorPage';
+ // 运营端获取司机账户明细信息
+ $api_get_driver_account_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceDriverByOperatorPage';
// 运营端端获取货主交易收入与支出金额
$api_get_shipper_account_balance_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceShipperIncomeDetailByOperator';
// 运营端端获取司机交易收入与支出金额
@@ -22,6 +24,25 @@ export class FreightAccountService extends ShipperBaseService {
// 货主端获取账户余额交易明细
$api_get_balance_by_shipper = '/api/fcc/accountBalanceDetail/getAccountBalanceByShipperPage';
+ // 查询订单支付申请表
+ $api_get_order_payment_page = '/api/fcc/billPaymentApplicationOBC/list/page';
+
+ // 查询提现申请表
+ $api_get_refund_page = '/api/fcc/refundApplicationSMC/list/page';
+ // 获取提现申请表详情
+ $api_get_refund_detail = '/api/fcc/refundApplicationSMC/get';
+ // 同意提现
+ $api_agree_refund = '/api/fcc/refundApplicationSMC/agreeRefund';
+ // 拒绝提现
+ $api_disagree_refund = '/api/fcc/refundApplicationSMC/disagreeRefund';
+
+ // 查询充值信息表
+ $api_get_recharge_page = '/api/fcc/rechargeInfo/list/page';
+ // 查询异常入金
+ $api_get_abnormal_gold_page = '/api/fcc/rechargeInfo/list/page';
+ // 运营端获取账户余额交易明细
+ $api_get_account_blance = '/api/fcc/accountBalanceDetail/getAccountBalanceByPage';
+
constructor(public injector: Injector) {
super(injector);
}
diff --git a/src/app/shared/components/dict-select/dict-select.component.html b/src/app/shared/components/dict-select/dict-select.component.html
index b77d29c5..2cf37405 100644
--- a/src/app/shared/components/dict-select/dict-select.component.html
+++ b/src/app/shared/components/dict-select/dict-select.component.html
@@ -1,3 +1,3 @@
-
+
diff --git a/src/app/shared/components/logistics-time-line/logistics-time-line.component.html b/src/app/shared/components/logistics-time-line/logistics-time-line.component.html
index 34f96ff9..5ab3688a 100644
--- a/src/app/shared/components/logistics-time-line/logistics-time-line.component.html
+++ b/src/app/shared/components/logistics-time-line/logistics-time-line.component.html
@@ -1,6 +1,5 @@
- 快件已签收
- 正在派送中，请您准备签收（派件人：吴彦祖，联系电话：13811223133）
- 快件已到【深圳市龙岗区配送中心】扫描员是【张三】
- 【顺丰快递】的收件员已揽件
+
+
+
\ No newline at end of file
diff --git a/src/app/shared/components/logistics-time-line/logistics-time-line.component.ts b/src/app/shared/components/logistics-time-line/logistics-time-line.component.ts
index e57ad269..ed2607da 100644
--- a/src/app/shared/components/logistics-time-line/logistics-time-line.component.ts
+++ b/src/app/shared/components/logistics-time-line/logistics-time-line.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
@Component({
selector: 'app-logistics-time-line',
@@ -6,10 +6,15 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./logistics-time-line.component.less']
})
export class LogisticsTimeLineComponent implements OnInit {
+ @Input()
+ data: any = [
+ { time: '2020-07-29 11:02:00', value: '到账成功', color: 'green' },
+ { time: '2020-07-29 11:02:00', value: '银行处理中', color: 'gray' },
+ { time: '2020-07-29 11:02:00', value: '审核通过
操作人员：李四', color: 'gray' },
+ { time: '2020-07-29 11:02:00', value: '提交提现申请
提现1000.00元至招商银行（8889）
操作人员：张三', color: 'gray' }
+ ];
- constructor() { }
-
- ngOnInit(): void {
- }
+ constructor() {}
+ ngOnInit(): void {}
}
diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts
index 6ec37b96..c28b335d 100644
--- a/src/app/shared/services/business/shipper-base.service.ts
+++ b/src/app/shared/services/business/shipper-base.service.ts
@@ -9,7 +9,7 @@ export class ShipperBaseService extends BaseService {
$api_get_carless_carrier = ``; // 获取承运人
$api_get_enterprise_project = `/api/mdc/cuc/enterpriseProject/getEnterpriseProjectList `; // 所属项目列表
$api_get_staff_list = `/api/mdc/cuc/userApp/getStaffList`; //查询企业项目员工列表(录单员)
- $api_get_network_freight_forwarder = `/api/mdc/networkTransporter/findAll`; // 获取网络货运人
+ $api_get_network_freight_forwarder = `/api/mdc/cuc/networkTransporter/findAll`; // 获取网络货运人
constructor(public injector: Injector) {
super(injector);