diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.ts b/src/app/routes/partner/recorded/components/detail/detail.component.ts
index 1f235de5..d5a1877e 100644
--- a/src/app/routes/partner/recorded/components/detail/detail.component.ts
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts
@@ -26,12 +26,19 @@ export class PartnerRecordedDetailComponent implements OnInit {
this.service.request(this.service.$api_get_recorded_record_detail, { id }).subscribe(res => {
if (res) {
this.formData = res;
+
+ }
+ });
+ this.service.request(this.service.$api_get_getPartnerInvoiceEntryDetail, { id }).subscribe(res => {
+ if (res) {
// 处理流程节点数据
// 流程是否结束
+ console.log(res);
+ // submitTime creattime
let isEnd = false;
- if (res.successTime) {
+ if (res.reAuditTime) {
isEnd = true;
- if (res.refundStatus === '3') {
+ if (res.sts === '3') {
this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' });
} else {
this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' });
@@ -40,6 +47,22 @@ export class PartnerRecordedDetailComponent implements OnInit {
if (res.agreeTime && res.refundStatus !== '4') {
this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
}
+ if (res.reAuditTime) {
+ if (res.refundStatus === '4') {
+ isEnd = true;
+ this.timeLineData.push({
+ time: res.reAuditTime,
+ value: `拒绝提现
操作人员:${res.handlerUserIdLabel}`,
+ color: 'red'
+ });
+ } else {
+ this.timeLineData.push({
+ time: res.reAuditTime,
+ value: `审核通过
操作人员:${res.handlerUserIdLabel}`,
+ color: 'gray'
+ });
+ }
+ }
if (res.agreeTime) {
if (res.refundStatus === '4') {
isEnd = true;
diff --git a/src/app/routes/partner/recorded/services/recorded.service.ts b/src/app/routes/partner/recorded/services/recorded.service.ts
index 6135dae6..2dddb1d7 100644
--- a/src/app/routes/partner/recorded/services/recorded.service.ts
+++ b/src/app/routes/partner/recorded/services/recorded.service.ts
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-04-21 13:49:22
* @LastEditors : Shiming
- * @LastEditTime : 2022-04-25 11:11:58
+ * @LastEditTime : 2022-05-12 15:02:19
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\recorded\\services\\recorded.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -22,6 +22,7 @@ export class RecordedService extends BaseService {
$api_agree_recorded = ``; // 同意审核
$api_audit_recored = `/api/bpc/partnerInvoiceEntry/oprationAudit`; // 审核单据
$api_get_list_summary = `/api/bpc/partnerInvoiceEntry/invoiceEntrySummary`; // 每页统计
+ $api_get_getPartnerInvoiceEntryDetail = `/api/bpc/partnerInvoiceEntry/getPartnerInvoiceEntryDetail`; // 获取合伙人发票入账明细
constructor(public injector: Injector) {
super(injector);
}
diff --git a/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts b/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts
index 6bb43c7b..addcb379 100644
--- a/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts
+++ b/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts
@@ -66,7 +66,7 @@ export class ExpressDetailModalComponent implements OnInit {
placeholder: '发票号码'
}
},
- expressno: {
+ vatinvcode: {
title: '',
type: 'string',
ui: {