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] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97=E6=89=B9?=
 =?UTF-8?q?=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 })}>