From 91bc849b49439ff7252700ecb40ef4f39cd9c947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 5 Mar 2024 14:23:13 +0800 Subject: [PATCH] =?UTF-8?q?feature/2.10.1.2402.01-=E7=A4=BE=E4=BF=9D?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=AF=BC=E5=85=A5=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/apis/calculate.js | 4 ++++ .../acctResult/importModal/selectFieldModal.js | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/apis/calculate.js b/pc4mobx/hrmSalary/apis/calculate.js index 1cfca645..d328b700 100644 --- a/pc4mobx/hrmSalary/apis/calculate.js +++ b/pc4mobx/hrmSalary/apis/calculate.js @@ -232,6 +232,10 @@ export const updateLockStatus = (params) => { export const cacheImportField = (params) => { return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/cacheImportField", params); }; +// 导入社保台账添加表头字段缓存 +export const cacheWelfareListField = (params) => { + return postFetch("/api/bs/hrmsalary/siaccount/cacheWelfareList", params); +}; //薪资核算-页面查看权限 export const salaryacctAcctresultCheckAuth = params => { return WeaTools.callApi("/api/bs/hrmsalary/salaryacct/acctresult/checkAuth", "GET", params); diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js index f288cc35..2dc1d2f3 100644 --- a/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js +++ b/pc4mobx/hrmSalary/pages/calculateDetail/acctResult/importModal/selectFieldModal.js @@ -2,7 +2,7 @@ import React from "react"; import { Button, Col, Row } from "antd"; import { inject, observer } from "mobx-react"; import { WeaCheckbox, WeaDialog } from "ecCom"; -import { cacheImportField } from "../../../../apis/calculate"; +import { cacheImportField, cacheWelfareListField } from "../../../../apis/calculate"; @inject("calculateStore", "standingBookStore") @observer @@ -112,15 +112,24 @@ export default class SelectFieldModal extends React.Component { //薪资核算详情页面的导入表单字段缓存功能 if (window.location.hash.indexOf("calculateDetail") !== -1) { const { status } = await this.cacheImportField(); + } else if (window.location.hash.indexOf("standingBookDetail") !== -1) { + const { status } = await this.cacheWelfareListField(); } 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 }); }; + //社保台账导入缓存字段 + cacheWelfareListField = () => { + const salaryItemList = _.reduce(_.keys(this.fieldData), (pre, cur) => ([...pre, ...this.fieldData[cur]]), []); + const welfareNames = _.map(_.filter(salaryItemList, it => !!it.checked), item => item.fieldId); + return cacheWelfareListField({ welfareNames }); + }; // 标题checkbox点击 handleTitleCheckboxChange(value, flag) {