diff --git a/pc4mobx/hrmSalary/apis/calculate.js b/pc4mobx/hrmSalary/apis/calculate.js index f2bd582a..85805d5c 100644 --- a/pc4mobx/hrmSalary/apis/calculate.js +++ b/pc4mobx/hrmSalary/apis/calculate.js @@ -228,6 +228,10 @@ export const getColumnDesc = (params) => { export const updateLockStatus = (params) => { return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/updateLockStatus", params); }; +// 更新薪资核算结果的锁定状态 +export const updateLockEmpStatus = (params) => { + return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/lockEmp", params); +}; // 导入薪资核算添加表头字段缓存 export const cacheImportField = (params) => { return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/cacheImportField", params); diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index d5df0036..1c6bb065 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -8,7 +8,7 @@ import React, { Component } from "react"; import { WeaLocaleProvider, WeaTools } from "ecCom"; import { message, Modal, Spin } from "antd"; import { inject, observer } from "mobx-react"; -import { acctResultList, updateLockStatus } from "../../../../../apis/calculate"; +import { acctResultList, updateLockEmpStatus, updateLockStatus } from "../../../../../apis/calculate"; import ProgressModal from "../../../../../components/progressModal"; import BatchUpdateSalaryItemValDialog from "./batchUpdateSalaryItemValDialog"; import EditSalaryCalcSlide from "./editSalaryCalcSlide"; @@ -57,12 +57,15 @@ class EditCalcTable extends Component { this.props.onShowFormulaTd(dataIndex); break; case "LOCKING": - const { salaryItemId, lockType: lockStatus } = params; - if (lockStatus === "BATCHUPDATE") { + const { salaryItemId, lockType } = params; + if (lockType === "BATCHUPDATE") { this.batchUpdateSalaryItemVal(params); return; } - this.updateLockStatus({ lockStatus, salaryItemId }); + this.updateLockStatus({ lockStatus: lockType, salaryItemId }); + break; + case "LOCKEMP": + this.updateEmpLockStatus({ ...params }); break; case "EDIT": const { id: salaryCalcId } = params; @@ -131,6 +134,52 @@ class EditCalcTable extends Component { } }); }; + updateEmpLockStatus = (payload) => { + const { lockStatus } = payload; + Modal.confirm({ + title: getLabel(131329, "信息确认"), + content: