fix bug
This commit is contained in:
@ -53,7 +53,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
|
|||||||
delete value1.employeeVO;
|
delete value1.employeeVO;
|
||||||
let value = res.employeeVO;
|
let value = res.employeeVO;
|
||||||
List.push({ label: value.empName + '/' + value.empNo, value: value.empNo });
|
List.push({ label: value.empName + '/' + value.empNo, value: value.empNo });
|
||||||
res.roleInfoVOList.forEach((element: any) => {
|
res?.roleInfoVOList?.forEach((element: any) => {
|
||||||
List3.push(element.id);
|
List3.push(element.id);
|
||||||
});
|
});
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
|||||||
@ -36,26 +36,18 @@ export class PartnerRecordedDetailComponent implements OnInit {
|
|||||||
console.log(res);
|
console.log(res);
|
||||||
// submitTime creattime
|
// submitTime creattime
|
||||||
let isEnd = false;
|
let isEnd = false;
|
||||||
if (res.modifyTime) {
|
if (res.sts == '2') {
|
||||||
isEnd = true;
|
isEnd = true;
|
||||||
if (res.sts === '3') {
|
|
||||||
this.timeLineData.push({ time: res.modifyTime, value: `入账成功`, color: 'green' });
|
this.timeLineData.push({ time: res.modifyTime, value: `入账成功`, color: 'green' });
|
||||||
} else {
|
} else if (res.sts == '3'){
|
||||||
|
isEnd = true;
|
||||||
this.timeLineData.push({ time: res.modifyTime, value: `入账失败`, color: 'red' });
|
this.timeLineData.push({ time: res.modifyTime, value: `入账失败`, color: 'red' });
|
||||||
}
|
}
|
||||||
}
|
|
||||||
// if (res.agreeTime && res.refundStatus !== '4') {
|
// if (res.agreeTime && res.refundStatus !== '4') {
|
||||||
// this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
|
// this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
|
||||||
// }
|
// }
|
||||||
if (res.reAuditTime) {
|
if (res.reAuditTime) {
|
||||||
if (res.refundStatus === '4') {
|
if (res.sts === '2') {
|
||||||
isEnd = true;
|
|
||||||
this.timeLineData.push({
|
|
||||||
time: res.reAuditTime,
|
|
||||||
value: `拒绝申请<br/>操作人员:${res.reAuditName}`,
|
|
||||||
color: 'red'
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
this.timeLineData.push({
|
this.timeLineData.push({
|
||||||
time: res.reAuditTime,
|
time: res.reAuditTime,
|
||||||
value: `审核通过<br/>操作人员:${res.reAuditName}`,
|
value: `审核通过<br/>操作人员:${res.reAuditName}`,
|
||||||
@ -64,14 +56,7 @@ export class PartnerRecordedDetailComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (res.firstAuditTime) {
|
if (res.firstAuditTime) {
|
||||||
if (res.refundStatus === '4') {
|
if (res.sts === '1') {
|
||||||
isEnd = true;
|
|
||||||
this.timeLineData.push({
|
|
||||||
time: res.firstAuditTime,
|
|
||||||
value: `拒绝申请<br/>操作人员:${res.fristAuditName}`,
|
|
||||||
color: 'red'
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
this.timeLineData.push({
|
this.timeLineData.push({
|
||||||
time: res.firstAuditTime,
|
time: res.firstAuditTime,
|
||||||
value: `审核通过<br/>操作人员:${res.fristAuditName}`,
|
value: `审核通过<br/>操作人员:${res.fristAuditName}`,
|
||||||
@ -79,7 +64,7 @@ export class PartnerRecordedDetailComponent implements OnInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (res.submitTime) {
|
if (res.sts) {
|
||||||
this.timeLineData.push({
|
this.timeLineData.push({
|
||||||
time: res.submitTime,
|
time: res.submitTime,
|
||||||
value: `提交入账申请<br/>入账${res.entryAmount}元至${res.fictitiousAccount}<br/>操作人员:${res.submitUserName}`,
|
value: `提交入账申请<br/>入账${res.entryAmount}元至${res.fictitiousAccount}<br/>操作人员:${res.submitUserName}`,
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2021-12-27 10:30:56
|
* @Date : 2021-12-27 10:30:56
|
||||||
* @LastEditors : Shiming
|
* @LastEditors : Shiming
|
||||||
* @LastEditTime : 2022-05-13 11:42:37
|
* @LastEditTime : 2022-05-13 14:06:34
|
||||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
*/
|
*/
|
||||||
@ -59,7 +59,7 @@ export class TaxManagementService extends ShipperBaseService {
|
|||||||
// 获取发票上传列表
|
// 获取发票上传列表
|
||||||
$api_getInvoiceReport_page = '/api/sdc/invoiceUploadInfo/list/page';
|
$api_getInvoiceReport_page = '/api/sdc/invoiceUploadInfo/list/page';
|
||||||
// 发票上传列表导出
|
// 发票上传列表导出
|
||||||
$api_invoiceUpload_export = '/api/sdc/exportInvoiceUpload/exportInvoiceUpload';
|
$api_invoiceUpload_export = '/api/sdc/invoiceUploadInfo/exportInvoiceUpload';
|
||||||
// 个税明细导出接口
|
// 个税明细导出接口
|
||||||
$api_taxIncome_export = '/api/sdc/taxIncome/asyncExport';
|
$api_taxIncome_export = '/api/sdc/taxIncome/asyncExport';
|
||||||
// 个税汇总导出接口
|
// 个税汇总导出接口
|
||||||
|
|||||||
Reference in New Issue
Block a user