From 7a0647252a462a2826c0f1ed4d7c3ab256c5c91c Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 13 May 2022 11:01:40 +0800
Subject: [PATCH] fix bug

---
 .../add-personal-partner/add-personal-partner.component.ts    | 4 +++-
 .../individual-declare/individual-declare.component.ts        | 2 +-
 .../individual-income/individual-income.component.ts          | 2 +-
 .../invoice-reporting/invoice-reporting.component.ts          | 2 +-
 .../components/order-reporting/order-reporting.component.ts   | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
index ff731ffa..080c1e62 100644
--- a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
+++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
@@ -114,7 +114,7 @@ export class AddPersonalPartnerComponent {
       side: isFront
     };
     this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => {
-      if (res) {
+      if (res.name) {
         console.log(res);
         
         // 法定代表人证件照
@@ -140,6 +140,8 @@ export class AddPersonalPartnerComponent {
             this.sf.setValue('/adminUserInfo/_isLoingDate', true);
           }
         }
+      } else {
+        this.sf.setValue('/adminUserInfo/_isLoingDate', false);
       }
     });
   }
diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
index bd102b3d..96dd3167 100644
--- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
+++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
@@ -299,7 +299,7 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent
   unnormal(value: any) {
     this.modal.confirm({
       nzTitle: '税务审核结果',
-      nzContent: '订单结算时间所在月份与申报月份不一致',
+      nzContent: `${value?.exceptionInfo}`,
       nzOkText: '确定',
       nzCancelText: '',
       nzOnOk: () => {
diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts
index e2a1ad34..754cbb65 100644
--- a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts
+++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts
@@ -322,7 +322,7 @@ export class TaxManagementIndividualIncomeComponent extends BasicTableComponent
     }
     // this.modal.warning({
     //   nzTitle: '申报提示',
-    //   nzContent: '订单结算时间所在月份与申报月份不一致......'
+    // nzContent: `${value?.exceptionInfo}`,
     // });
     // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
     //   if (res) {
diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts
index 5c26cc75..b7391876 100644
--- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts
+++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts
@@ -251,7 +251,7 @@ export class TaxManagementInvoiceReportingComponent extends BasicTableComponent
     });
     this.modal.confirm({
       nzTitle: '税务审核结果',
-      nzContent: '订单结算时间所在月份与申报月份不一致',
+      nzContent: `${value?.exceptionInfo}`,
       nzOkText: '确定',
       nzCancelText: '',
       nzOnOk: () => {
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 fb1280d1..654eca3b 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
@@ -321,7 +321,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
     });
     this.modal.confirm({
       nzTitle: '税务审核结果',
-      nzContent: '订单结算时间所在月份与申报月份不一致',
+      nzContent: `${value?.exceptionInfo}`,
       nzOkText: '确定',
       nzCancelText: '',
       nzOnOk: () => {