diff --git a/pc4mobx/hrmSalary/apis/calculate.js b/pc4mobx/hrmSalary/apis/calculate.js index 009a9bd8..e6d54ae8 100644 --- a/pc4mobx/hrmSalary/apis/calculate.js +++ b/pc4mobx/hrmSalary/apis/calculate.js @@ -290,5 +290,7 @@ export const getCompareSobConfig = params => { export const updateSobConfig = params => { return WeaTools.callApi("/api/bs/hrmsalary/salaryacct/updateSobConfig", "GET", params); }; - - +//安徽国元信托有限责任公司薪酬二开-薪资核算项添加右击添加标记和取消标记的操作-标记/取消标记 +export const updateMarkOrUnMark = (params) => { + return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/mark", params); +}; diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index 986bb1bb..09d5c6f0 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -12,7 +12,8 @@ import { acctResultList, updateLockEmpCellStatus, updateLockEmpStatus, - updateLockStatus + updateLockStatus, + updateMarkOrUnMark } from "../../../../../apis/calculate"; import ProgressModal from "../../../../../components/progressModal"; import BatchUpdateSalaryItemValDialog from "./batchUpdateSalaryItemValDialog"; @@ -83,11 +84,26 @@ class EditCalcTable extends Component { const { salaryItemId: itemid, acctEmpId } = params; window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/topologyView/${salarySobId}/${itemid}?acctEmpId=${acctEmpId}`, "_blank"); break; + // 安徽国元信托有限责任公司薪酬二开-薪资核算项添加右击添加标记和取消标记的操作 + case "MARK": + case "UNMARK": + this.updateMarkOrUnMark(params); + break; default: break; } } }; + updateMarkOrUnMark = (payload) => { + updateMarkOrUnMark(payload).then(({ status, errormsg }) => { + if (status) { + message.success(getLabel(111, "操作成功!")); + this.queryCalcResultList(); + } else { + message.error(errormsg); + } + }); + }; updateLockStatus = (payload) => { const { salarySobId } = this.props; const { lockStatus, salaryItemId } = payload; @@ -238,7 +254,9 @@ class EditCalcTable extends Component { "总计": getLabel(523, "总计"), "批量解锁": getLabel(111, "批量解锁"), "批量锁定": getLabel(111, "批量锁定"), "批量更新": getLabel(111, "批量更新"), "查看拓扑图": getLabel(111, "查看拓扑图"), "锁定": getLabel(111, "锁定"), - "解锁": getLabel(111, "解锁"), "查看": getLabel(111, "查看") + "解锁": getLabel(111, "解锁"), "查看": getLabel(111, "查看"), + "标记": getLabel(111, "标记"), "取消标记": getLabel(111, "取消标记"), + "标记的项目值": getLabel(111, "标记的项目值") }; this.setState({ originPayloadData: { ...payload, i18n } }); const childFrameObj = document.getElementById("atdTable"); @@ -337,7 +355,9 @@ const traverse = (arr, calcDetail) => { return { title: item.text, width: item.width + "px", fixed: item.fixed || false, dataIndex: item.column, ellipsis: true, lockStatus: item.lockStatus, calcDetail, - pattern: item.pattern, dataType: item.dataType, align: "center" + pattern: item.pattern, dataType: item.dataType, align: "center", + // 安徽国元信托有限责任公司薪酬二开-薪资核算项添加右击添加标记和取消标记的操作 + rightClickType: ["MARK", "UNMARK"] }; } });