From 08b48d09ef072f51b0530916d693bc724383655a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 22 May 2023 09:40:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84=E6=A0=B8?=
 =?UTF-8?q?=E7=AE=97=E5=AF=BC=E5=85=A5=E8=A1=A8=E5=A4=B4=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../importModal/acctResultImportModal.js      | 71 +++++++++++++++++--
 1 file changed, 66 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js
index 766594f7..9f8a3084 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/acctResultImportModal.js
@@ -2,6 +2,7 @@ import React from "react";
 import ImportModal from "../../../../components/importModal";
 import { Badge, Button, message } from "antd";
 import { inject, observer } from "mobx-react";
+import SelectFieldModal from "./selectFieldModal";
 import { getQueryString } from "../../../../util/url";
 import AddHeaderFieldsModal from "./addHeaderFieldsModal";
 
@@ -118,12 +119,55 @@ export default class AcctResultImportModal extends React.Component {
 
   // 选择表单字段
   handleSelectedField = () => {
+    if (window.location.hash.indexOf("calculateDetail") !== -1) {
+      this.setState({
+        addHeadFields: {
+          ...this.state.addHeadFields,
+          visible: true
+        }
+      });
+    } else {
+      this.setState({
+        selectFieldVisible: true
+      });
+    }
+  };
+
+  // 添加表头字段
+  handleAdd = (fieldDate) => {
+    let salaryItemIdsList = [];
+    if (!_.isEmpty(fieldDate.formulaItems)) {
+      fieldDate.formulaItems.map(item => {
+        if (item.checked) {
+          salaryItemIdsList.push(item.salaryItemId);
+        }
+      });
+    }
+    if (!_.isEmpty(fieldDate.inputItems)) {
+      fieldDate.inputItems.map(item => {
+        if (item.checked) {
+          salaryItemIdsList.push(item.salaryItemId);
+        }
+      });
+    }
+    if (!_.isEmpty(fieldDate.sqlItems)) {
+      fieldDate.sqlItems.map(item => {
+        if (item.checked) {
+          salaryItemIdsList.push(item.salaryItemId);
+        }
+      });
+    }
+    let salaryItemIds = "";
+    if (salaryItemIdsList.length > 0) {
+      salaryItemIds = salaryItemIdsList.join(",");
+    }
+
+    let modalParam = { ...this.state.modalParam };
+    modalParam.salaryItemIds = salaryItemIds;
     this.setState({
-      addHeadFields: {
-        ...this.state.addHeadFields,
-        visible: true
-      }
+      modalParam
     });
+    this.props.onAdd(fieldDate);
   };
 
   // 初始化Import数据
@@ -172,7 +216,7 @@ export default class AcctResultImportModal extends React.Component {
       importInsuranceAcctDetail,
       importBalanceInsuranceDetail
     } = standingBookStore;
-    const { step, modalParam, addHeadFields } = this.state;
+    const { step, modalParam, selectFieldVisible, addHeadFields } = this.state;
     return (
       <div>
         {
@@ -211,6 +255,23 @@ export default class AcctResultImportModal extends React.Component {
             }}
           />
         }
+        {
+          selectFieldVisible && <SelectFieldModal
+            isStandingBook={isStandingBook}
+            standingBookType={standingBookType}
+            id={this.props.id}
+            visible={selectFieldVisible}
+            fieldData={this.props.fieldData}
+            onAdd={(fieldDate) => {
+              this.handleAdd(fieldDate);
+            }}
+            onCancel={() => {
+              this.setState({
+                selectFieldVisible: false
+              });
+            }}
+          />
+        }
         <AddHeaderFieldsModal {...addHeadFields} selectItems={modalParam.salaryItemIds}
                               onCancel={() => this.setState({ addHeadFields: { ...addHeadFields, visible: false } })}
                               onAdd={(salaryItemIds) => this.setState({