From 94c919603e9f32b4d44b47827a908316b3d77f0b Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Wed, 26 Mar 2025 09:30:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feature/2.19.1.2501.01-=E5=8F=8C=E5=87=BB?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A0=B8=E7=AE=97=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/salaryEditCalc/editCalcTable.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index 986bb1bb..1dee7e63 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -10,6 +10,7 @@ import { message, Modal, Spin } from "antd"; import { inject, observer } from "mobx-react"; import { acctResultList, + salaryacctBatchUpdate, updateLockEmpCellStatus, updateLockEmpStatus, updateLockStatus @@ -83,6 +84,9 @@ 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 "EDITCELL": + this.updateSalaryItemVal(params); + break; default: break; } @@ -188,6 +192,17 @@ class EditCalcTable extends Component { } }); }; + updateSalaryItemVal = (payload) => { + const { routeParams: { salaryAcctRecordId } } = this.props; + salaryacctBatchUpdate({ ...payload, salaryAcctRecordId }).then(({ status, errormsg }) => { + if (status) { + message.success(getLabel(30700, "操作成功！")); + this.queryCalcResultList(); + } else { + message.error(errormsg); + } + }); + }; batchUpdateSalaryItemVal = (payload) => { Modal.confirm({ title: getLabel(131329, "信息确认"), @@ -238,7 +253,8 @@ 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, "双击单元格更新") }; this.setState({ originPayloadData: { ...payload, i18n } }); const childFrameObj = document.getElementById("atdTable"); From c4dff5d2b50da51c59eb177c03a3f085c86ab0de Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Wed, 26 Mar 2025 16:28:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feature/2.19.1.2501.01-=E5=8F=8C=E5=87=BB?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A0=B8=E7=AE=97=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doCalc/components/salaryEditCalc/editCalcTable.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index 1dee7e63..6c828ad2 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -194,6 +194,9 @@ class EditCalcTable extends Component { }; updateSalaryItemVal = (payload) => { const { routeParams: { salaryAcctRecordId } } = this.props; + if (!_.every(payload, (value) => { + return !_.isEmpty(value) && value !== null && value !== undefined && value !== ""; + })) return; salaryacctBatchUpdate({ ...payload, salaryAcctRecordId }).then(({ status, errormsg }) => { if (status) { message.success(getLabel(30700, "操作成功！")); From 2ecda3758b9b4dd62342be527cf6acc67487b983 Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Wed, 26 Mar 2025 17:02:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feature/2.19.1.2501.01-=E5=8F=8C=E5=87=BB?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A0=B8=E7=AE=97=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doCalc/components/salaryEditCalc/editCalcTable.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index 6c828ad2..4252cf1d 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -194,9 +194,7 @@ class EditCalcTable extends Component { }; updateSalaryItemVal = (payload) => { const { routeParams: { salaryAcctRecordId } } = this.props; - if (!_.every(payload, (value) => { - return !_.isEmpty(value) && value !== null && value !== undefined && value !== ""; - })) return; + if (!payload.salaryItemId) return; salaryacctBatchUpdate({ ...payload, salaryAcctRecordId }).then(({ status, errormsg }) => { if (status) { message.success(getLabel(30700, "操作成功！")); @@ -312,8 +310,8 @@ class EditCalcTable extends Component {