diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.html b/src/app/routes/partner/recorded/components/detail/detail.component.html index 8bfafd61..a3421887 100644 --- a/src/app/routes/partner/recorded/components/detail/detail.component.html +++ b/src/app/routes/partner/recorded/components/detail/detail.component.html @@ -4,8 +4,8 @@ * @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 + * @LastEditTime : 2022-05-11 15:06:17 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\recorded\\components\\detail\\detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -40,7 +40,7 @@ {{formData?.entryNumber}} - {{formData?.bankName}} + {{formData?.bankType}} {{formData?.fictitiousAccount}} @@ -58,7 +58,10 @@ {{formData?.recordedAmount | currency}} - {{formData?.stsLabel}} + 待审核 + 待复核 + 已入账 + 已驳回 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 08d5e9bc..479d2daa 100644 --- a/src/app/routes/partner/recorded/components/detail/detail.component.ts +++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts @@ -29,44 +29,44 @@ export class PartnerRecordedDetailComponent implements OnInit { 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: `拒绝提现
操作人员:${res.handlerUserIdLabel}`, - // color: 'red' - // }); - // } else { - // this.timeLineData.push({ - // time: res.agreeTime, - // value: `审核通过
操作人员:${res.handlerUserIdLabel}`, - // color: 'gray' - // }); - // } - // } - // if (res.createTime) { - // this.timeLineData.push({ - // time: res.createTime, - // value: `提交提现申请
提现${res.amount}元至${res.bankName}(${res.bankCardNumber})
操作人员:${res.userIdLabel}`, - // color: 'gray' - // }); - // } - // if (this.timeLineData?.length > 0 && !isEnd) { - // this.timeLineData[0].color = 'green'; - // } + 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: `拒绝提现
操作人员:${res.handlerUserIdLabel}`, + color: 'red' + }); + } else { + this.timeLineData.push({ + time: res.agreeTime, + value: `审核通过
操作人员:${res.handlerUserIdLabel}`, + color: 'gray' + }); + } + } + if (res.createTime) { + this.timeLineData.push({ + time: res.createTime, + value: `提交提现申请
提现${res.amount}元至${res.bankName}(${res.bankCardNumber})
操作人员:${res.userIdLabel}`, + color: 'gray' + }); + } + if (this.timeLineData?.length > 0 && !isEnd) { + this.timeLineData[0].color = 'green'; + } } }); } diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 577406c9..93b7dcd7 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -226,7 +226,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im { title: '卸货地详细地址', index: 'unloadDetailedAddress', className: 'text-center', width: '180px' }, { title: '货主名称', index: 'shipperName', className: 'text-center', width: '180px' }, { title: '货主纳税人识别号', index: 'shipperProvinceCode', className: 'text-center', width: '180px' }, - { title: '录单时间', index: 'recordTime', className: 'text-center', width: '250px' }, + { title: '录单时间', index: 'billCreateTime', className: 'text-center', width: '250px' }, { title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' }, { title: '发车时间', index: 'loadTime', className: 'text-center', width: '200px' }, { title: '到车时间', index: 'unloadTime', className: 'text-center', width: '150px' },