From bdd4b4e446ffa663aa94b12d874191aa9cd1b066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 10 Oct 2024 15:32:41 +0800
Subject: [PATCH] release/2.15.2.2409.01

---
 pc4mobx/hrmSalary/layout.js                           |  7 ++-----
 .../doCalc/components/salaryEditCalcImport/index.js   |  2 +-
 pc4mobx/hrmSalary/pages/calculate/doCalc/index.js     | 11 +++++++++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pc4mobx/hrmSalary/layout.js b/pc4mobx/hrmSalary/layout.js
index df3d02d3..39c9d174 100644
--- a/pc4mobx/hrmSalary/layout.js
+++ b/pc4mobx/hrmSalary/layout.js
@@ -30,6 +30,7 @@ class Layout extends Component {
   }
 
   componentDidMount() {
+    this.setFontSize();
     if (window.e9LibsConfigCustomF && _.some(window.e9LibsConfigCustomF, o => (_.some(o, k => k === "h_hrmSalary")))) {
       const src = "/spa/hrmSalary/hrmSalaryCalculateDetail/css/iconfont/iconfont.css";
       const link = document.createElement("link");
@@ -48,11 +49,7 @@ class Layout extends Component {
     window.removeEventListener("storage", this.setFontSize);
   }
 
-  componentDidUpdate(prevProps, prevState, snapshot) {
-    this.setFontSize();
-  }
-
-  setFontSize = (init = false) => {
+  setFontSize = () => {
     const { themeFontSize } = JSON.parse(localStorage.getItem("theme-themeInfo")) || { themeFontSize: "12" };
     if (window.location.href.indexOf("/spa/hrmSalary/") !== -1) {
       const href = `/cloudstore/resource/pc/com/font-size/${themeFontSize}px.css`;
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
index ce58c616..accd461f 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
@@ -156,7 +156,7 @@ class Index extends Component {
             }
           }, () => {
             const { selectItems: salaryItems } = this.state.headerFieldsDialog;
-            cacheImportField({ salaryItems: salaryItems ? salaryItems.split(",") : [] })
+            cacheImportField({ salaryAcctRecordId, salaryItems: salaryItems ? salaryItems.split(",") : [] })
               .then(({ status, errormsg }) => {
                 if (status) {
                   const payload = {
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
index 0d1c87fc..fc07e2f2 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
@@ -125,6 +125,15 @@ class Index extends Component {
       case "offlineCompare":
         window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/calcOc/${salaryAcctRecordId}`, "_blank");
         break;
+      case "LOCK":
+      case "UNLOCK":
+        const { selectedRowKeys } = this.calc.calcTableRef.wrappedInstance.state;
+        if (_.isEmpty(selectedRowKeys)) {
+          message.warning(getLabel(543303, "请选择表格数据！"));
+          return;
+        }
+        this.calc.calcTableRef.wrappedInstance.updateEmpLockStatus({ lockStatus: key, acctEmpIds: selectedRowKeys });
+        break;
       default:
         break;
     }
@@ -145,6 +154,8 @@ class Index extends Component {
             <Menu.Item key="exportAll">{getLabel(81272, "导出全部")}</Menu.Item>
             <Menu.Item key="export_custom">{getLabel(544270, "自定义导出")}</Menu.Item>
             <Menu.Item key="offlineCompare">{getLabel(543249, "线下对比")}</Menu.Item>
+            <Menu.Item key="LOCK">{getLabel(111, "批量锁定")}</Menu.Item>
+            <Menu.Item key="UNLOCK">{getLabel(111, "批量解锁")}</Menu.Item>
           </Menu>
         );
         reqBtns = [