From e3aab0fc5b96d07e4d8094309a52cbe5ff4e5503 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 19 Apr 2022 14:24:00 +0800
Subject: [PATCH] fix bug

---
 proxy.conf.js                                    |  4 ++--
 .../individual-collect.component.ts              | 16 ++++++----------
 .../order-reporting/order-reporting.component.ts | 11 +++++++++++
 .../services/tax-management.service.ts           |  4 +++-
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/proxy.conf.js b/proxy.conf.js
index cea0fccb..3639702c 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-04-19 13:17:35
+ * @LastEditTime : 2022-04-19 14:20:28
  * @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-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },
diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
index f893b05a..032f85fe 100644
--- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
+++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
@@ -285,16 +285,12 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
    * @param params 更新数据
    */
   uploadSetting() {
-    if (this.selectedRows.length === 0) {
-      this.service.msgSrv.warning('请选择需要更新的数据');
-      return;
-    }
-    // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
-    //   if (res) {
-    //     this.service.msgSrv.success('更新成功');
-    //     this.search();
-    //   }
-    // })
+    this.service.request(this.service.$api_get_updateData).subscribe((res: any) => {
+      if (res) {
+        this.service.msgSrv.success('更新成功');
+        this.search();
+      }
+    })
   }
 
   search() {
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 424f8f6f..0b7f33a6 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
@@ -413,10 +413,21 @@ export class TaxManagementOrderReportingComponent implements OnInit {
    * 上传
    */
   upload() {
+    let status = false
     if (this.selectedRows.length === 0) {
       this.openWainingModal('请选择需要上传的数据');
       return;
     }
+    this.selectedRows.forEach(item => {
+      if (item?.putStatus != '0') {
+        status = true
+      }
+
+    });
+    if(status) {
+      this.service.msgSrv.warning('选择了已上传，请重新勾选！');
+      return;
+    }
     let params: any[] = [];
     this.selectedRows.forEach(item => {
       params.push(item.id);
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 dcf02420..5cfd0639 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-04-09 14:22:35
+ * @LastEditTime : 2022-04-19 14:19:44
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -50,6 +50,8 @@ export class TaxManagementService extends ShipperBaseService {
   $api_get_taxDeclaration = `/api/sdc/taxDeclaration/list/page`;
   // 更新所有税务申报
   $api_get_taxDeclaration_updateAll = `/api/sdc/taxDeclaration/updateAll`;
+  // 更新所有个税汇总
+  $api_get_updateData = `/api/sdc/taxSummary/updateData`;
   $api_recall_reporting = ``; // 撤回
   $api_async_export_order_reporting_list = ``; // 导出订单上报
   $api_get_upload_setting = ``; // 修改上传设置