From 785ecf9ae8d7d3bc409536cfc77ccb6a0890e5cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Fri, 17 Mar 2023 17:52:27 +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=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=B7=BB=E5=8A=A0=E9=A2=9D=E5=A4=96=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=93=E5=AD=98=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/calculate.js | 11 +++++ .../importModal/selectFieldModal.js | 41 +++++++++++++------ 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/pc4mobx/hrmSalary/apis/calculate.js b/pc4mobx/hrmSalary/apis/calculate.js index 44b57717..e44dfc25 100644 --- a/pc4mobx/hrmSalary/apis/calculate.js +++ b/pc4mobx/hrmSalary/apis/calculate.js @@ -520,3 +520,14 @@ export const siaccountDetailCommonListSum = (params) => { body: JSON.stringify(params) }).then(res => res.json()); }; +// 导入薪资核算添加表头字段缓存 +export const cacheImportField = (params) => { + return fetch("/api/bs/hrmsalary/salaryacct/acctresult/cacheImportField", { + method: "POST", + mode: "cors", + headers: { + "Content-Type": "application/json" + }, + body: JSON.stringify(params) + }).then(res => res.json()); +}; diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js index d6353ffc..bacbe74c 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js @@ -2,8 +2,7 @@ import React from "react"; import { Button, Col, Row } from "antd"; import { inject, observer } from "mobx-react"; import { WeaCheckbox, WeaDialog } from "ecCom"; - -const APIFox = {}; +import { cacheImportField } from "../../../../apis/calculate"; @inject("calculateStore", "standingBookStore") @observer @@ -39,13 +38,25 @@ export default class SelectFieldModal extends React.Component { if (this.props.fieldData.inputItems) { sqlItems = this.props.fieldData.sqlItems; } - fieldData.formulaItems = formulaItems; - fieldData.inputItems = inputItems; - fieldData.sqlItems = sqlItems; - - this.setState({ - fieldData + fieldData.formulaItems = _.map(formulaItems, item => { + if (data.checkItems.includes(item.salaryItemId)) { + return { ...item, checked: true }; + } + return { ...item }; }); + fieldData.inputItems = _.map(inputItems, item => { + if (data.checkItems.includes(item.salaryItemId)) { + return { ...item, checked: true }; + } + return { ...item }; + }); + fieldData.sqlItems = _.map(sqlItems, item => { + if (data.checkItems.includes(item.salaryItemId)) { + return { ...item, checked: true }; + } + return { ...item }; + }); + this.setState({ fieldData }); this.fieldData = fieldData; }); } else { @@ -97,10 +108,16 @@ export default class SelectFieldModal extends React.Component { } // 添加按钮点击回调 - handleAddClick() { + handleAddClick = async () => { + const { status } = await this.cacheImportField(); this.props.onAdd(this.fieldData); this.props.onCancel(); - } + }; + cacheImportField = () => { + const salaryItemList = _.reduce(_.keys(this.fieldData), (pre, cur) => ([...pre, ...this.fieldData[cur]]), []); + const salaryItems = _.map(_.filter(salaryItemList, it => !!it.checked), item => item.salaryItemId); + return cacheImportField({ salaryItems }); + }; // 标题checkbox点击 handleTitleCheckboxChange(value, flag) { @@ -160,9 +177,7 @@ export default class SelectFieldModal extends React.Component { this.props.onCancel(); }} buttons={[ - + ]} >