From 72d02ad754fa8bde4ba5ae743b757379f774006e 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 Dec 2023 17:15:55 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feature/2.9.9.2312.01-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=88=97=E8=A1=A8=E5=9C=A8=E7=BA=BF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salaryEditCalc/editCalcTable.js           | 15 +++++++++-----
 .../doCalc/components/salaryEditCalc/index.js | 20 ++++++++++++++++---
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index 5a3e2aa3..61556d7e 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -22,7 +22,7 @@ class EditCalcTable extends Component {
     this.state = {
       loading: false, pageInfo: { current: 1, pageSize: 10, total: 0 },
       selectedRowKeys: [], progressVisible: false, progress: 0,
-      salaryCalcSlide: { visible: false, id: "" }
+      salaryCalcSlide: { visible: false, id: "" }, originPayloadData: {}
     };
     this.timerLock = null;
   }
@@ -127,6 +127,7 @@ class EditCalcTable extends Component {
       "总计": getLabel(523, "总计"), "批量解锁": getLabel(111, "批量解锁"),
       "批量锁定": getLabel(111, "批量锁定")
     };
+    this.setState({ originPayloadData: { ...payload, i18n } });
     const childFrameObj = document.getElementById("atdTable");
     childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
   };
@@ -151,7 +152,9 @@ class EditCalcTable extends Component {
           const { pageInfo, selectedRowKeys } = this.state;
           const sumRowlistUrl = this.props.showTotalCell ? "/api/bs/hrmsalary/salaryacct/acctresult/sum" : "";
           this.postMessageToChild({
-            dataSource, pageInfo, selectedRowKeys, showTotalCell: this.props.showTotalCell, sumRowlistUrl, payload,
+            dataSource, pageInfo, selectedRowKeys,
+            showTotalCell: this.props.showTotalCell, sumRowlistUrl,
+            payload, editable: false,
             columns: _.every(traverse(columns), (it, idx) => !it.fixed) ? _.map(traverse(columns), (it, idx) => ({
               ...it,
               fixed: idx < 2 ? "left" : false
@@ -161,6 +164,7 @@ class EditCalcTable extends Component {
       }
     }).catch(() => this.setState({ loading: false }));
   };
+  handleBatchEditing = (editable) => this.postMessageToChild({ ...this.state.originPayloadData, editable });
 
   render() {
     const { loading, progressVisible, progress, salaryCalcSlide } = this.state;
@@ -169,8 +173,8 @@ class EditCalcTable extends Component {
         <Spin spinning={loading}>
           <iframe
             style={{ border: 0, width: "100%", height: "100%" }}
-            // src="http://localhost:7607/#/calcTable"
-            src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/calcTable"
+            src="http://localhost:7607/#/calcTable"
+            // src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/calcTable"
             id="atdTable"
           />
           <EditSalaryCalcSlide {...salaryCalcSlide}
@@ -210,7 +214,8 @@ const traverse = (arr) => {
     } else {
       return {
         title: item.text, width: item.width + "px", fixed: item.fixed || false,
-        dataIndex: item.column, ellipsis: true, lockStatus: item.lockStatus
+        dataIndex: item.column, ellipsis: true, lockStatus: item.lockStatus,
+        pattern: item.pattern
       };
     }
   });
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
index 8618f667..fed5f8e3 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
@@ -6,6 +6,7 @@
  */
 import React, { Component } from "react";
 import { WeaHelpfulTip, WeaLocaleProvider } from "ecCom";
+import { Button } from "antd";
 import { getColumnDesc, getSalarySobCycle } from "../../../../../apis/calculate";
 import { sysConfCodeRule } from "../../../../../apis/ruleconfig";
 import EditCalcAdvanceSearchPannel from "./editCalcAdvanceSearchPannel";
@@ -20,7 +21,7 @@ class Index extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      salarySobCycle: {}, showSearchAd: false,
+      salarySobCycle: {}, showSearchAd: false, editable: false,
       columnDesc: {}, formulaTd: "", showTotalCell: false
     };
   }
@@ -48,9 +49,14 @@ class Index extends Component {
     }
   };
   handleShowFormulaTa = (dataIndex) => this.setState({ formulaTd: dataIndex });
+  handleBatchEditing = (editable) => {
+    this.setState({ editable: !this.state.editable }, () => {
+      this.calcTableRef.wrappedInstance.handleBatchEditing(editable);
+    });
+  };
 
   render() {
-    const { salarySobCycle, showSearchAd, formulaTd, columnDesc, showTotalCell } = this.state;
+    const { salarySobCycle, showSearchAd, formulaTd, columnDesc, showTotalCell, editable } = this.state;
     const { routeParams: { salaryAcctRecordId } } = this.props;
     const formulaObj = _.get(columnDesc, [formulaTd]) || {};
     return (
@@ -72,7 +78,15 @@ class Index extends Component {
             <span>{getLabel(18125, "公式")}=</span>
             <span>{formulaObj.formulaContent}</span>
           </div>
-          <div></div>
+          <div style={{ paddingRight: 8 }}>
+            {
+              !editable ?
+                <Button type="primary"
+                        onClick={() => this.handleBatchEditing(true)}>{getLabel(545071, "批量编辑")}</Button> :
+                <Button type="primary"
+                        onClick={() => this.handleBatchEditing(false)}>{getLabel(537558, "保存")}</Button>
+            }
+          </div>
         </div>
         <div className={cs("searchAdvanced-condition-container", { "searchAdvanced-condition-hide": !showSearchAd })}>
           <EditCalcAdvanceSearchPannel

From 6e56b436d6b217ec6ee6c87eb67dcebacc377844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 6 Dec 2023 14:46:36 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feature/2.9.9.2312.01-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=88=97=E8=A1=A8=E5=9C=A8=E7=BA=BF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91-=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0=E8=96=AA?=
 =?UTF-8?q?=E8=B5=84=E9=A1=B9=E7=9B=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../batchUpdateSalaryItemValDialog.js         | 46 +++++++++++++++
 .../components/salaryEditCalc/condition.js    | 31 ++++++++++
 .../salaryEditCalc/editCalcTable.js           | 56 ++++++++++++++++---
 .../components/salaryEditCalc/index.less      | 22 ++++++++
 pc4mobx/hrmSalary/stores/calculate.js         |  3 +-
 pc4mobx/hrmSalary/util/index.js               | 19 ++-----
 6 files changed, 155 insertions(+), 22 deletions(-)
 create mode 100644 pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js
new file mode 100644
index 00000000..c9af3e66
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js
@@ -0,0 +1,46 @@
+/*
+ * Author: 黎永顺
+ * name: 批量更新-薪资项目的值
+ * Description:
+ * Date: 2023/12/6
+ */
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaDialog, WeaLocaleProvider } from "ecCom";
+import { Button } from "antd";
+import { getSearchs } from "../../../../../util";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("calculateStore")
+@observer
+class BatchUpdateSalaryItemValDialog extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      loading: false
+    };
+  }
+
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visibe && !nextProps.visible) nextProps.calculateStore.initBatchUpdateForm();
+  }
+
+  render() {
+    const { loading } = this.state;
+    const { conditions, calculateStore: { batchUpdateForm } } = this.props;
+    return (
+      <WeaDialog
+        {...this.props} title={getLabel(111, "批量更新")} initLoadCss
+        style={{ width: 480, height: 174 }}
+        buttons={[
+          <Button type="primary" onClick={this.save} loading={loading}>{getLabel(537558, "保存")}</Button>
+        ]}
+      >
+        <div className="calc-update-dialog-layout">{getSearchs(batchUpdateForm, conditions, 1, false)}</div>
+      </WeaDialog>
+    );
+  }
+}
+
+export default BatchUpdateSalaryItemValDialog;
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js
index 59fcb015..f0c59ed1 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js
@@ -143,3 +143,34 @@ export const editCalcSearchConditions = [
     title: "常用条件"
   }
 ];
+export const batchUpdateConditions = [
+  {
+    items: [
+      {
+        colSpan: 1,
+        conditionType: "INPUT",
+        domkey: ["salaryItemName"],
+        fieldcol: 14,
+        label: "批量编辑项目",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        viewAttr: 1
+      },
+      {
+        colSpan: 1,
+        conditionType: "INPUTNUMBER",
+        domkey: ["value"],
+        fieldcol: 14,
+        label: "批量编辑为",
+        lanId: 111,
+        labelcol: 6,
+        value: "",
+        rules: "required|string",
+        viewAttr: 3
+      }
+    ],
+    defaultshow: true,
+    title: ""
+  }
+];
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index 61556d7e..86bb622e 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -5,14 +5,17 @@
  * Date: 2023/9/14
  */
 import React, { Component } from "react";
-import { WeaLocaleProvider } from "ecCom";
+import { WeaLocaleProvider, WeaTools } from "ecCom";
 import { message, Modal, Spin } from "antd";
 import { inject, observer } from "mobx-react";
 import { acctResultList, updateLockStatus } from "../../../../../apis/calculate";
 import ProgressModal from "../../../../../components/progressModal";
+import BatchUpdateSalaryItemValDialog from "./batchUpdateSalaryItemValDialog";
 import EditSalaryCalcSlide from "./editSalaryCalcSlide";
+import { batchUpdateConditions } from "./condition";
 
 const getLabel = WeaLocaleProvider.getLabel;
+const getKey = WeaTools.getKey;
 
 @inject("calculateStore")
 @observer
@@ -22,7 +25,12 @@ class EditCalcTable extends Component {
     this.state = {
       loading: false, pageInfo: { current: 1, pageSize: 10, total: 0 },
       selectedRowKeys: [], progressVisible: false, progress: 0,
-      salaryCalcSlide: { visible: false, id: "" }, originPayloadData: {}
+      salaryCalcSlide: { visible: false, id: "" }, originPayloadData: {},
+      batchUpdateDialog: {
+        visible: false, salaryAcctRecordId: "", salaryAcctEmpIdList: [], salaryItemId: "",
+        conditions: []
+      },
+      editable: false
     };
     this.timerLock = null;
   }
@@ -50,7 +58,31 @@ class EditCalcTable extends Component {
           this.props.onShowFormulaTd(dataIndex);
           break;
         case "LOCKING":
-          const { salaryItemId, lockType: lockStatus } = params;
+          const { salaryItemId, salaryItemName, inputNode, pattern, lockType: lockStatus } = params;
+          if (lockStatus === "BATCHUPDATE") {
+            const { routeParams: { salaryAcctRecordId }, calculateStore: { batchUpdateForm } } = this.props;
+            const { selectedRowKeys: salaryAcctEmpIdList } = this.state;
+            this.setState({
+              batchUpdateDialog: {
+                ...this.state.batchUpdateDialog, visible: true, salaryAcctRecordId, salaryItemId,
+                salaryAcctEmpIdList, conditions: _.map(batchUpdateConditions, item => ({
+                  ...item, items: _.map(item.items, o => {
+                    if (getKey(o) === "value") {
+                      const otherParams = inputNode === "number" ? { precision: pattern } : {};
+                      return {
+                        ...o, ...otherParams, conditionType: inputNode === "number" ? "INPUTNUMBER" : "INPUT"
+                      };
+                    }
+                    return { ...o };
+                  })
+                }))
+              }
+            }, () => {
+              batchUpdateForm.initFormFields(this.state.batchUpdateDialog.conditions);
+              batchUpdateForm.updateFields({ salaryItemName });
+            });
+            return;
+          }
           this.updateLockStatus({ lockStatus, salaryItemId });
           break;
         case "EDIT":
@@ -125,14 +157,14 @@ class EditCalcTable extends Component {
       "当前状态未锁定，点击锁定": getLabel(111, "当前状态未锁定，点击锁定"),
       "共": getLabel(18609, "共"), "条": getLabel(18256, "条"),
       "总计": getLabel(523, "总计"), "批量解锁": getLabel(111, "批量解锁"),
-      "批量锁定": getLabel(111, "批量锁定")
+      "批量锁定": getLabel(111, "批量锁定"), "批量更新": getLabel(111, "批量更新")
     };
     this.setState({ originPayloadData: { ...payload, i18n } });
     const childFrameObj = document.getElementById("atdTable");
     childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
   };
   queryCalcResultList = () => {
-    const { pageInfo } = this.state;
+    const { pageInfo, editable } = this.state;
     const { calculateStore: { ECSearchForm, otherConditions }, routeParams: { salaryAcctRecordId } } = this.props;
     const { subcompanyIds, departmentIds, positionIds, statuses, ...extra } = ECSearchForm.getFormParams();
     const payload = {
@@ -154,7 +186,7 @@ class EditCalcTable extends Component {
           this.postMessageToChild({
             dataSource, pageInfo, selectedRowKeys,
             showTotalCell: this.props.showTotalCell, sumRowlistUrl,
-            payload, editable: false,
+            payload, editable,
             columns: _.every(traverse(columns), (it, idx) => !it.fixed) ? _.map(traverse(columns), (it, idx) => ({
               ...it,
               fixed: idx < 2 ? "left" : false
@@ -164,10 +196,13 @@ class EditCalcTable extends Component {
       }
     }).catch(() => this.setState({ loading: false }));
   };
-  handleBatchEditing = (editable) => this.postMessageToChild({ ...this.state.originPayloadData, editable });
+  handleBatchEditing = (editable) => {
+    this.setState({ editable }, () => this.postMessageToChild({ ...this.state.originPayloadData, editable }));
+  };
+
 
   render() {
-    const { loading, progressVisible, progress, salaryCalcSlide } = this.state;
+    const { loading, progressVisible, progress, salaryCalcSlide, batchUpdateDialog } = this.state;
     return (
       <div className="editCalcTable-layout">
         <Spin spinning={loading}>
@@ -177,6 +212,11 @@ class EditCalcTable extends Component {
             // src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/calcTable"
             id="atdTable"
           />
+          <BatchUpdateSalaryItemValDialog {...batchUpdateDialog}
+                                          onCancel={() => this.setState({
+                                            batchUpdateDialog: { ...batchUpdateDialog, visible: false }
+                                          })}
+          />
           <EditSalaryCalcSlide {...salaryCalcSlide}
                                onClose={(isFresh) => this.setState({
                                  salaryCalcSlide: {
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
index 91797921..77f3e425 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
@@ -185,3 +185,25 @@
     }
   }
 }
+
+.calc-update-dialog-layout {
+  background: #f6f6f6;
+
+  .wea-search-group {
+    padding: 16px;
+  }
+
+  .wea-content {
+    padding: 0;
+
+    .wea-form-cell-wrapper {
+      background: #FFF;
+      border: 1px solid #e5e5e5;
+      border-bottom: none;
+
+      .wea-form-cell {
+        border-bottom: 1px solid #e5e5e5;
+      }
+    }
+  }
+}
diff --git a/pc4mobx/hrmSalary/stores/calculate.js b/pc4mobx/hrmSalary/stores/calculate.js
index 71f64ab6..86d3b498 100644
--- a/pc4mobx/hrmSalary/stores/calculate.js
+++ b/pc4mobx/hrmSalary/stores/calculate.js
@@ -12,7 +12,8 @@ export class calculateStore {
   @observable ECSearchForm = new WeaForm(); //薪资核算-form
   @observable otherConditions = []; //薪资核算-其他查询条件
   @observable calculateForm = new WeaForm(); //薪资核算重构-核算form
-
+  @observable batchUpdateForm = new WeaForm(); //批量更新薪资项目-批量更新form
+  @action initBatchUpdateForm = () => this.batchUpdateForm = new WeaForm();
 
   @observable tableStore = new TableStore(); // new table
   @observable form = new WeaForm(); // nrew 一个form
diff --git a/pc4mobx/hrmSalary/util/index.js b/pc4mobx/hrmSalary/util/index.js
index 9be126dc..e5b3c1aa 100644
--- a/pc4mobx/hrmSalary/util/index.js
+++ b/pc4mobx/hrmSalary/util/index.js
@@ -117,17 +117,10 @@ export const padding0 = (num, length) => {
   }
   return "0." + num;
 };
-export const toDecimal_n = (x, num) => {
-  if (isNaN(parseFloat(x))) return false;
-  let f = Math.round(x * 100) / 100;
-  let s = f.toString();
-  let rs = s.indexOf(".");
-  if (rs < 0) {
-    rs = s.length;
-    s += ".";
-  }
-  while (s.length <= rs + num) {
-    s += "0";
-  }
-  return s;
+export const toDecimal_n = (num, decimalPlaces) => {
+  if (num === null || !isFinite(num)) return null
+  if (decimalPlaces < 0) return null;
+  const multiplier = Math.pow(10, decimalPlaces);
+  const roundedNum = Math.round(num * multiplier) / multiplier;
+  return roundedNum.toFixed(decimalPlaces);
 };

From 8a8804f0c1641bd33a9acb04f2b182be1b0159b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 6 Dec 2023 15:55:44 +0800
Subject: [PATCH 3/7] 1release/2.9.9.2312.01

---
 pc4mobx/hrmSalary/apis/calculate.js           |  4 +
 .../batchUpdateSalaryItemValDialog.js         | 29 ++++++-
 .../components/salaryEditCalc/condition.js    |  2 +-
 .../salaryEditCalc/editCalcTable.js           | 80 +++++++++++--------
 4 files changed, 76 insertions(+), 39 deletions(-)

diff --git a/pc4mobx/hrmSalary/apis/calculate.js b/pc4mobx/hrmSalary/apis/calculate.js
index a8ee74c4..b0efbcef 100644
--- a/pc4mobx/hrmSalary/apis/calculate.js
+++ b/pc4mobx/hrmSalary/apis/calculate.js
@@ -246,3 +246,7 @@ export const getExportField = params => {
 export const customCacheExportField = (params) => {
   return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/cacheExportField", params);
 };
+//薪资核算-批量更新
+export const salaryacctBatchUpdate = (params) => {
+  return postFetch("/api/bs/hrmsalary/salaryacct/acctresult/batchUpdate", params);
+};
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js
index c9af3e66..92f0f532 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js
@@ -5,10 +5,11 @@
  * Date: 2023/12/6
  */
 import React, { Component } from "react";
+import { Button, message } from "antd";
 import { inject, observer } from "mobx-react";
 import { WeaDialog, WeaLocaleProvider } from "ecCom";
-import { Button } from "antd";
-import { getSearchs } from "../../../../../util";
+import { getSearchs, toDecimal_n } from "../../../../../util";
+import { salaryacctBatchUpdate } from "../../../../../apis/calculate";
 
 const getLabel = WeaLocaleProvider.getLabel;
 
@@ -26,13 +27,35 @@ class BatchUpdateSalaryItemValDialog extends Component {
     if (nextProps.visible !== this.props.visibe && !nextProps.visible) nextProps.calculateStore.initBatchUpdateForm();
   }
 
+  save = () => {
+    const { calculateStore: { batchUpdateForm }, salaryAcctRecordId, salaryItemId, idList, pattern } = this.props;
+    batchUpdateForm.validateForm().then(f => {
+      if (f.isValid) {
+        const { value } = batchUpdateForm.getFormParams();
+        this.setState({ loading: true });
+        const payload = { salaryAcctRecordId, salaryItemId, idList, value: toDecimal_n(value, pattern) };
+        this.setState({ loading: false });
+        salaryacctBatchUpdate(payload).then(({ status, errormsg }) => {
+          if (status) {
+            message.success(getLabel(30700, "操作成功！"));
+            this.props.onCancel(true);
+          } else {
+            message.error(errormsg);
+          }
+        }).catch(() => this.setState({ loading: false }));
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+
   render() {
     const { loading } = this.state;
     const { conditions, calculateStore: { batchUpdateForm } } = this.props;
     return (
       <WeaDialog
         {...this.props} title={getLabel(111, "批量更新")} initLoadCss
-        style={{ width: 480, height: 174 }}
+        style={{ width: 480, height: 127 }}
         buttons={[
           <Button type="primary" onClick={this.save} loading={loading}>{getLabel(537558, "保存")}</Button>
         ]}
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js
index f0c59ed1..9340de40 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/condition.js
@@ -166,7 +166,7 @@ export const batchUpdateConditions = [
         lanId: 111,
         labelcol: 6,
         value: "",
-        rules: "required|string",
+        rules: "required",
         viewAttr: 3
       }
     ],
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index 86bb622e..e8b4c67d 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -27,10 +27,9 @@ class EditCalcTable extends Component {
       selectedRowKeys: [], progressVisible: false, progress: 0,
       salaryCalcSlide: { visible: false, id: "" }, originPayloadData: {},
       batchUpdateDialog: {
-        visible: false, salaryAcctRecordId: "", salaryAcctEmpIdList: [], salaryItemId: "",
-        conditions: []
-      },
-      editable: false
+        visible: false, salaryAcctRecordId: "", idList: [], salaryItemId: "",
+        conditions: [], pattern: 0
+      }
     };
     this.timerLock = null;
   }
@@ -58,29 +57,9 @@ class EditCalcTable extends Component {
           this.props.onShowFormulaTd(dataIndex);
           break;
         case "LOCKING":
-          const { salaryItemId, salaryItemName, inputNode, pattern, lockType: lockStatus } = params;
+          const { salaryItemId, lockType: lockStatus } = params;
           if (lockStatus === "BATCHUPDATE") {
-            const { routeParams: { salaryAcctRecordId }, calculateStore: { batchUpdateForm } } = this.props;
-            const { selectedRowKeys: salaryAcctEmpIdList } = this.state;
-            this.setState({
-              batchUpdateDialog: {
-                ...this.state.batchUpdateDialog, visible: true, salaryAcctRecordId, salaryItemId,
-                salaryAcctEmpIdList, conditions: _.map(batchUpdateConditions, item => ({
-                  ...item, items: _.map(item.items, o => {
-                    if (getKey(o) === "value") {
-                      const otherParams = inputNode === "number" ? { precision: pattern } : {};
-                      return {
-                        ...o, ...otherParams, conditionType: inputNode === "number" ? "INPUTNUMBER" : "INPUT"
-                      };
-                    }
-                    return { ...o };
-                  })
-                }))
-              }
-            }, () => {
-              batchUpdateForm.initFormFields(this.state.batchUpdateDialog.conditions);
-              batchUpdateForm.updateFields({ salaryItemName });
-            });
+            this.batchUpdateSalaryItemVal(params);
             return;
           }
           this.updateLockStatus({ lockStatus, salaryItemId });
@@ -142,6 +121,39 @@ class EditCalcTable extends Component {
       }
     });
   };
+  batchUpdateSalaryItemVal = (payload) => {
+    Modal.confirm({
+      title: getLabel(131329, "信息确认"),
+      content: <div>
+        <div style={{ textAlign: "center" }}>{getLabel(111, "确认编辑所有人员薪资核算记录？")}</div>
+      </div>,
+      onOk: () => {
+        const { salaryItemId, salaryItemName, dataType, pattern } = payload;
+        const { routeParams: { salaryAcctRecordId }, calculateStore: { batchUpdateForm } } = this.props;
+        const { selectedRowKeys: idList } = this.state;
+        this.setState({
+          batchUpdateDialog: {
+            ...this.state.batchUpdateDialog, visible: true, salaryAcctRecordId, salaryItemId,
+            idList, pattern, conditions: _.map(batchUpdateConditions, item => ({
+              ...item, items: _.map(item.items, o => {
+                if (getKey(o) === "value") {
+                  const otherParams = dataType === "number" ? { precision: pattern } : {};
+                  return {
+                    ...o, ...otherParams, label: getLabel(o.lanId, o.label),
+                    conditionType: dataType === "number" ? "INPUTNUMBER" : "INPUT"
+                  };
+                }
+                return { ...o, label: getLabel(o.lanId, o.label) };
+              })
+            }))
+          }
+        }, () => {
+          batchUpdateForm.initFormFields(this.state.batchUpdateDialog.conditions);
+          batchUpdateForm.updateFields({ salaryItemName });
+        });
+      }
+    });
+  };
 
   componentWillUnmount() {
     window.removeEventListener("message", this.handleReceive, false);
@@ -164,7 +176,7 @@ class EditCalcTable extends Component {
     childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
   };
   queryCalcResultList = () => {
-    const { pageInfo, editable } = this.state;
+    const { pageInfo } = this.state;
     const { calculateStore: { ECSearchForm, otherConditions }, routeParams: { salaryAcctRecordId } } = this.props;
     const { subcompanyIds, departmentIds, positionIds, statuses, ...extra } = ECSearchForm.getFormParams();
     const payload = {
@@ -184,9 +196,8 @@ class EditCalcTable extends Component {
           const { pageInfo, selectedRowKeys } = this.state;
           const sumRowlistUrl = this.props.showTotalCell ? "/api/bs/hrmsalary/salaryacct/acctresult/sum" : "";
           this.postMessageToChild({
-            dataSource, pageInfo, selectedRowKeys,
+            dataSource, pageInfo, selectedRowKeys, payload,
             showTotalCell: this.props.showTotalCell, sumRowlistUrl,
-            payload, editable,
             columns: _.every(traverse(columns), (it, idx) => !it.fixed) ? _.map(traverse(columns), (it, idx) => ({
               ...it,
               fixed: idx < 2 ? "left" : false
@@ -196,8 +207,7 @@ class EditCalcTable extends Component {
       }
     }).catch(() => this.setState({ loading: false }));
   };
-  handleBatchEditing = (editable) => {
-    this.setState({ editable }, () => this.postMessageToChild({ ...this.state.originPayloadData, editable }));
+  handleBatchEditing = () => {
   };
 
 
@@ -213,9 +223,9 @@ class EditCalcTable extends Component {
             id="atdTable"
           />
           <BatchUpdateSalaryItemValDialog {...batchUpdateDialog}
-                                          onCancel={() => this.setState({
+                                          onCancel={(isRefresh) => this.setState({
                                             batchUpdateDialog: { ...batchUpdateDialog, visible: false }
-                                          })}
+                                          }, () => isRefresh && this.queryCalcResultList())}
           />
           <EditSalaryCalcSlide {...salaryCalcSlide}
                                onClose={(isFresh) => this.setState({
@@ -249,13 +259,13 @@ const traverse = (arr) => {
       return {
         title: item.text, width: item.width + "px", ellipsis: true,
         dataIndex: item.column, children: traverse(item.children),
-        fixed: item.fixed || false
+        fixed: item.fixed || false, dataType: item.dataType
       };
     } else {
       return {
         title: item.text, width: item.width + "px", fixed: item.fixed || false,
         dataIndex: item.column, ellipsis: true, lockStatus: item.lockStatus,
-        pattern: item.pattern
+        pattern: item.pattern, dataType: item.dataType
       };
     }
   });

From 2864e1e4467f5dcc18fb7018ccca2ff8917e3eea 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, 7 Dec 2023 09:40:34 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feature/2.9.9.2312.01-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=88=97=E8=A1=A8=E5=9C=A8=E7=BA=BF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doCalc/components/salaryEditCalc/index.js   | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
index fed5f8e3..63c86a3f 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
@@ -21,7 +21,7 @@ class Index extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      salarySobCycle: {}, showSearchAd: false, editable: false,
+      salarySobCycle: {}, showSearchAd: false,
       columnDesc: {}, formulaTd: "", showTotalCell: false
     };
   }
@@ -50,13 +50,11 @@ class Index extends Component {
   };
   handleShowFormulaTa = (dataIndex) => this.setState({ formulaTd: dataIndex });
   handleBatchEditing = (editable) => {
-    this.setState({ editable: !this.state.editable }, () => {
-      this.calcTableRef.wrappedInstance.handleBatchEditing(editable);
-    });
+    this.calcTableRef.wrappedInstance.handleBatchEditing(editable);
   };
 
   render() {
-    const { salarySobCycle, showSearchAd, formulaTd, columnDesc, showTotalCell, editable } = this.state;
+    const { salarySobCycle, showSearchAd, formulaTd, columnDesc, showTotalCell } = this.state;
     const { routeParams: { salaryAcctRecordId } } = this.props;
     const formulaObj = _.get(columnDesc, [formulaTd]) || {};
     return (
@@ -79,13 +77,8 @@ class Index extends Component {
             <span>{formulaObj.formulaContent}</span>
           </div>
           <div style={{ paddingRight: 8 }}>
-            {
-              !editable ?
-                <Button type="primary"
-                        onClick={() => this.handleBatchEditing(true)}>{getLabel(545071, "批量编辑")}</Button> :
-                <Button type="primary"
-                        onClick={() => this.handleBatchEditing(false)}>{getLabel(537558, "保存")}</Button>
-            }
+            <Button type="primary"
+                    onClick={() => this.handleBatchEditing(true)}>{getLabel(111, "批量保存")}</Button>
           </div>
         </div>
         <div className={cs("searchAdvanced-condition-container", { "searchAdvanced-condition-hide": !showSearchAd })}>

From 254d19c44e2568f730cc76103f9bdefc50b6d071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 11 Dec 2023 13:31:46 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salaryEditCalc/batchUpdateSalaryItemValDialog.js   | 10 ++++++++--
 .../doCalc/components/salaryEditCalc/editCalcTable.js  |  6 +++---
 .../doCalc/components/salaryEditCalc/index.js          |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js
index 92f0f532..7f92a0cb 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/batchUpdateSalaryItemValDialog.js
@@ -28,12 +28,18 @@ class BatchUpdateSalaryItemValDialog extends Component {
   }
 
   save = () => {
-    const { calculateStore: { batchUpdateForm }, salaryAcctRecordId, salaryItemId, idList, pattern } = this.props;
+    const {
+      calculateStore: { batchUpdateForm }, salaryAcctRecordId, salaryItemId,
+      idList, pattern, dataType
+    } = this.props;
     batchUpdateForm.validateForm().then(f => {
       if (f.isValid) {
         const { value } = batchUpdateForm.getFormParams();
         this.setState({ loading: true });
-        const payload = { salaryAcctRecordId, salaryItemId, idList, value: toDecimal_n(value, pattern) };
+        const payload = {
+          salaryAcctRecordId, salaryItemId, idList,
+          value: dataType === "number" ? toDecimal_n(value, pattern) : value
+        };
         this.setState({ loading: false });
         salaryacctBatchUpdate(payload).then(({ status, errormsg }) => {
           if (status) {
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index e8b4c67d..83bc6f8b 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -28,7 +28,7 @@ class EditCalcTable extends Component {
       salaryCalcSlide: { visible: false, id: "" }, originPayloadData: {},
       batchUpdateDialog: {
         visible: false, salaryAcctRecordId: "", idList: [], salaryItemId: "",
-        conditions: [], pattern: 0
+        conditions: [], pattern: 0, dataType: ""
       }
     };
     this.timerLock = null;
@@ -125,7 +125,7 @@ class EditCalcTable extends Component {
     Modal.confirm({
       title: getLabel(131329, "信息确认"),
       content: <div>
-        <div style={{ textAlign: "center" }}>{getLabel(111, "确认编辑所有人员薪资核算记录？")}</div>
+        <div style={{ textAlign: "center" }}>{getLabel(111, "确认编辑所有人员（所选人员）薪资核算记录？")}</div>
       </div>,
       onOk: () => {
         const { salaryItemId, salaryItemName, dataType, pattern } = payload;
@@ -134,7 +134,7 @@ class EditCalcTable extends Component {
         this.setState({
           batchUpdateDialog: {
             ...this.state.batchUpdateDialog, visible: true, salaryAcctRecordId, salaryItemId,
-            idList, pattern, conditions: _.map(batchUpdateConditions, item => ({
+            idList, pattern, dataType, conditions: _.map(batchUpdateConditions, item => ({
               ...item, items: _.map(item.items, o => {
                 if (getKey(o) === "value") {
                   const otherParams = dataType === "number" ? { precision: pattern } : {};
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
index 63c86a3f..caf11158 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
@@ -77,8 +77,8 @@ class Index extends Component {
             <span>{formulaObj.formulaContent}</span>
           </div>
           <div style={{ paddingRight: 8 }}>
-            <Button type="primary"
-                    onClick={() => this.handleBatchEditing(true)}>{getLabel(111, "批量保存")}</Button>
+            {/*<Button type="primary"*/}
+            {/*        onClick={() => this.handleBatchEditing(true)}>{getLabel(111, "批量保存")}</Button>*/}
           </div>
         </div>
         <div className={cs("searchAdvanced-condition-container", { "searchAdvanced-condition-hide": !showSearchAd })}>

From 253ba3cc8c20e3ee97df97f7fa0433ed46ee1e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 11 Dec 2023 13:32:17 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doCalc/components/salaryEditCalc/editCalcTable.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index 83bc6f8b..545cd0db 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -218,8 +218,8 @@ class EditCalcTable extends Component {
         <Spin spinning={loading}>
           <iframe
             style={{ border: 0, width: "100%", height: "100%" }}
-            src="http://localhost:7607/#/calcTable"
-            // src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/calcTable"
+            // src="http://localhost:7607/#/calcTable"
+            src="/spa/hrmSalary/hrmSalaryCalculateDetail/index.html#/calcTable"
             id="atdTable"
           />
           <BatchUpdateSalaryItemValDialog {...batchUpdateDialog}

From 717a88667cd6bbe474fba13eaab3a69e5688cbe5 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, 12 Dec 2023 10:41:33 +0800
Subject: [PATCH 7/7] =?UTF-8?q?feature/2.9.9.2312.01-=E8=96=AA=E8=B5=84?=
 =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=88=97=E8=A1=A8=E5=9C=A8=E7=BA=BF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doCalc/components/salaryEditCalc/editCalcTable.js         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
index 545cd0db..7c0124f9 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
@@ -259,13 +259,13 @@ const traverse = (arr) => {
       return {
         title: item.text, width: item.width + "px", ellipsis: true,
         dataIndex: item.column, children: traverse(item.children),
-        fixed: item.fixed || false, dataType: item.dataType
+        fixed: item.fixed || false, dataType: item.dataType, align: "center"
       };
     } else {
       return {
         title: item.text, width: item.width + "px", fixed: item.fixed || false,
         dataIndex: item.column, ellipsis: true, lockStatus: item.lockStatus,
-        pattern: item.pattern, dataType: item.dataType
+        pattern: item.pattern, dataType: item.dataType, align: "center"
       };
     }
   });