From 1e595503457ee1a4d0c6c0780c7bfa7bdea66900 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 13 May 2022 14:09:08 +0800
Subject: [PATCH] fix bug

---
 .../components/edit/edit.component.ts         |  2 +-
 .../components/detail/detail.component.ts     | 29 +++++--------------
 .../services/tax-management.service.ts        |  4 +--
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
index 27bd17ea..379832fb 100644
--- a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
+++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
@@ -53,7 +53,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
           delete value1.employeeVO;
           let value = res.employeeVO;
           List.push({ label: value.empName + '/' + value.empNo, value: value.empNo });
-          res.roleInfoVOList.forEach((element: any) => {
+          res?.roleInfoVOList?.forEach((element: any) => {
             List3.push(element.id);
           });
           setTimeout(() => {
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 854a6e62..61f55aa2 100644
--- a/src/app/routes/partner/recorded/components/detail/detail.component.ts
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts
@@ -36,26 +36,18 @@ export class PartnerRecordedDetailComponent implements OnInit {
         console.log(res);
         // submitTime creattime
         let isEnd = false;
-        if (res.modifyTime) {
-          isEnd = true;
-          if (res.sts === '3') {
+          if (res.sts == '2') {
+            isEnd = true;
             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' });
           }
-        }
         // 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: `拒绝申请<br/>操作人员：${res.reAuditName}`,
-              color: 'red'
-            });
-          } else {
+          if (res.sts === '2') {
             this.timeLineData.push({
               time: res.reAuditTime,
               value: `审核通过<br/>操作人员：${res.reAuditName}`,
@@ -64,14 +56,7 @@ export class PartnerRecordedDetailComponent implements OnInit {
           }
         }
         if (res.firstAuditTime) {
-          if (res.refundStatus === '4') {
-            isEnd = true;
-            this.timeLineData.push({
-              time: res.firstAuditTime,
-              value: `拒绝申请<br/>操作人员：${res.fristAuditName}`,
-              color: 'red'
-            });
-          } else {
+          if (res.sts === '1') {
             this.timeLineData.push({
               time: res.firstAuditTime,
               value: `审核通过<br/>操作人员：${res.fristAuditName}`,
@@ -79,7 +64,7 @@ export class PartnerRecordedDetailComponent implements OnInit {
             });
           }
         }
-        if (res.submitTime) {
+        if (res.sts) {
           this.timeLineData.push({
             time: res.submitTime,
             value: `提交入账申请<br/>入账${res.entryAmount}元至${res.fictitiousAccount}<br/>操作人员：${res.submitUserName}`,
diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts
index ebe510bb..e5a166e5 100644
--- a/src/app/routes/tax-management/services/tax-management.service.ts
+++ b/src/app/routes/tax-management/services/tax-management.service.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-27 10:30:56
  * @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
  * 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_invoiceUpload_export = '/api/sdc/exportInvoiceUpload/exportInvoiceUpload';
+  $api_invoiceUpload_export = '/api/sdc/invoiceUploadInfo/exportInvoiceUpload';
   // 个税明细导出接口
   $api_taxIncome_export = '/api/sdc/taxIncome/asyncExport';
   // 个税汇总导出接口