diff --git a/proxy.conf.js b/proxy.conf.js
index e283d993..b9ef4924 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
- * @LastEditTime : 2022-05-13 09:36:19
+ * @LastEditTime : 2022-05-13 13:38:02
* @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@@ -30,7 +30,7 @@ module.exports = {
// },
'//api': {
target: {
- host: 'tms-api-test.eascs.com',
+ host: 'tms-api-dev.eascs.com',
protocol: 'https:',
port: 443
},
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 d5a1877e..854a6e62 100644
--- a/src/app/routes/partner/recorded/components/detail/detail.component.ts
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts
@@ -36,53 +36,53 @@ export class PartnerRecordedDetailComponent implements OnInit {
console.log(res);
// submitTime creattime
let isEnd = false;
- if (res.reAuditTime) {
+ if (res.modifyTime) {
isEnd = true;
if (res.sts === '3') {
- this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' });
+ this.timeLineData.push({ time: res.modifyTime, value: `入账成功`, color: 'green' });
} else {
- this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' });
+ this.timeLineData.push({ time: res.modifyTime, value: `入账失败`, color: 'red' });
}
}
- if (res.agreeTime && res.refundStatus !== '4') {
- this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
- }
+ // 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}`,
+ value: `拒绝申请
操作人员:${res.reAuditName}`,
color: 'red'
});
} else {
this.timeLineData.push({
time: res.reAuditTime,
- value: `审核通过
操作人员:${res.handlerUserIdLabel}`,
+ value: `审核通过
操作人员:${res.reAuditName}`,
color: 'gray'
});
}
}
- if (res.agreeTime) {
+ if (res.firstAuditTime) {
if (res.refundStatus === '4') {
isEnd = true;
this.timeLineData.push({
- time: res.agreeTime,
- value: `拒绝提现
操作人员:${res.handlerUserIdLabel}`,
+ time: res.firstAuditTime,
+ value: `拒绝申请
操作人员:${res.fristAuditName}`,
color: 'red'
});
} else {
this.timeLineData.push({
- time: res.agreeTime,
- value: `审核通过
操作人员:${res.handlerUserIdLabel}`,
+ time: res.firstAuditTime,
+ value: `审核通过
操作人员:${res.fristAuditName}`,
color: 'gray'
});
}
}
- if (res.createTime) {
+ if (res.submitTime) {
this.timeLineData.push({
- time: res.createTime,
- value: `提交提现申请
提现${res.amount}元至${res.bankName}(${res.bankCardNumber})
操作人员:${res.userIdLabel}`,
+ time: res.submitTime,
+ value: `提交入账申请
入账${res.entryAmount}元至${res.fictitiousAccount}
操作人员:${res.submitUserName}`,
color: 'gray'
});
}
diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts
index fc135f18..a96db086 100644
--- a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts
+++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts
@@ -354,7 +354,7 @@ export class NetworkFreightNewComponent implements OnInit {
type: 'string',
title: '行业',
enum: [
- { label: '道路运输业', value: 54},
+ { label: '普通货物道路运输', value: 5431},
],
default: 0,
ui: {