From 229101d3e54a291e76e7de435a2fa53c73d87825 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 13 Oct 2023 16:15:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20KPI:=20=E5=88=A0=E9=99=A4:=20=E5=A4=9A?=
 =?UTF-8?q?=E8=A1=8C=E5=88=A0=E9=99=A4;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/kpi/SubjectTable/Count.jsx  | 3 ++-
 src/components/kpi/SubjectTable/Profit.jsx | 3 ++-
 src/components/kpi/SubjectTable/Rates.jsx  | 3 ++-
 src/stores/KPI.js                          | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/kpi/SubjectTable/Count.jsx b/src/components/kpi/SubjectTable/Count.jsx
index 083fc65..233e2d8 100644
--- a/src/components/kpi/SubjectTable/Count.jsx
+++ b/src/components/kpi/SubjectTable/Count.jsx
@@ -247,7 +247,8 @@ export default observer((props) => {
               onDelete: (_key, _row) => {
                 const rowKpiIds = (_row?.kpiData || []).map((ele) => ele.kpi_id);
                 rowKpiIds.push(_row?.kpiYear?.kpi_id);
-                setDelKpiIds(rowKpiIds);
+                const _mergeDids = [].concat(delKpiIds, rowKpiIds);
+                setDelKpiIds(_mergeDids);
               },
               onValuesChange: (record, recordList) => {
                 onTableChange(recordList);
diff --git a/src/components/kpi/SubjectTable/Profit.jsx b/src/components/kpi/SubjectTable/Profit.jsx
index c417422..465a46f 100644
--- a/src/components/kpi/SubjectTable/Profit.jsx
+++ b/src/components/kpi/SubjectTable/Profit.jsx
@@ -247,7 +247,8 @@ export default observer((props) => {
               onDelete: (_key, _row) => {
                 const rowKpiIds = (_row?.kpiData || []).map((ele) => ele.kpi_id);
                 rowKpiIds.push(_row?.kpiYear?.kpi_id);
-                setDelKpiIds(rowKpiIds);
+                const _mergeDids = [].concat(delKpiIds, rowKpiIds);
+                setDelKpiIds(_mergeDids);
               },
               onValuesChange: (record, recordList) => {
                 onTableChange(recordList);
diff --git a/src/components/kpi/SubjectTable/Rates.jsx b/src/components/kpi/SubjectTable/Rates.jsx
index 5a7c1d9..d874c9a 100644
--- a/src/components/kpi/SubjectTable/Rates.jsx
+++ b/src/components/kpi/SubjectTable/Rates.jsx
@@ -245,7 +245,8 @@ export default observer((props) => {
               onDelete: (_key, _row) => {
                 const rowKpiIds = (_row?.kpiData || []).map((ele) => ele.kpi_id);
                 rowKpiIds.push(_row?.kpiYear?.kpi_id);
-                setDelKpiIds(rowKpiIds);
+                const _mergeDids = [].concat(delKpiIds, rowKpiIds);
+                setDelKpiIds(_mergeDids);
               },
               onValuesChange: (record, recordList) => {
                 onTableChange(recordList);
diff --git a/src/stores/KPI.js b/src/stores/KPI.js
index dd76555..4f22898 100644
--- a/src/stores/KPI.js
+++ b/src/stores/KPI.js
@@ -41,10 +41,10 @@ class KPI {
     this.pageData = [];
     const json = await req.fetchJSON('/service-Analyse2/getkpi', _param);
     if (json.errcode === 0) {
+      const yearData = parseKPI(json.result, ['subject', 'object_id']);
       runInAction(() => {
         this.listLoading = false;
         this.originData = json.result;
-        const yearData = parseKPI(json.result, ['subject', 'object_id']);
         // console.log(111, yearData, yearData[this.settingYear]);
         this.pageData = yearData?.[this.settingYear]?.[this.settingSubject] || [];
       });