From a5e0ca30845e79993c6423751f8698d0bd245a8a 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, 31 Aug 2023 15:02:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E5=85=AC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=9D=E5=AD=98=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ledgerSalaryItemEditSlide.js        |  2 +-
 .../ledgerPage/components/ledgerSalaryItemTable.js |  9 +++++----
 .../pages/salaryItem/customSalaryItemSlide.js      | 14 +++++++++-----
 .../hrmSalary/pages/salaryItem/formalFormModal.js  |  2 +-
 .../hrmSalary/pages/salaryItem/salaryItemForm.js   |  2 +-
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js
index de0c2871..d476edbd 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js
@@ -23,7 +23,7 @@ class LedgerSalaryItemEditSlide extends Component {
     const key = Object.keys(params)[0];
     this.props.onUpdateRequest(request, key);
   };
-  handleShowFormal = () => this.props.onEditFormnul();
+  handleShowFormal = (salaryItemName) => this.props.onEditFormnul(salaryItemName);
 
   render() {
     return (
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
index 55892da2..123b74ab 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -28,7 +28,8 @@ class LedgerSalaryItemTable extends Component {
         visible: false,
         formulaId: "",
         valueType: "",
-        dataType: ""
+        dataType: "",
+        name: ""
       }
     };
   }
@@ -163,13 +164,13 @@ class LedgerSalaryItemTable extends Component {
       originSqlContent: ((valueType.toString() === "2" && (!originFormulaContent || originFormulaContent === " ")) || (valueType.toString() === "1") || (valueType.toString() === "2" && originFormulaContent)) ? " " : originSqlContent
     }, salaryItemId);
   };
-  handleEditFormnul = () => {
+  handleEditFormnul = (salaryItemName) => {
     const { salaryItemPayload, editFormulModal } = this.state;
     const { record } = salaryItemPayload;
     const { valueType, formulaId, dataType, originFormulaContent, originSqlContent } = record;
     this.setState({
       editFormulModal: {
-        ...editFormulModal, visible: true, valueType, dataType,
+        ...editFormulModal, visible: true, valueType, dataType, name: salaryItemName,
         formulaId: ((valueType.toString() === "2" && (originFormulaContent || originFormulaContent !== " ")) || valueType.toString() === "3" && (originSqlContent || originSqlContent === " ")) ? formulaId : ""
       }
     });
@@ -180,7 +181,7 @@ class LedgerSalaryItemTable extends Component {
       editFormulModal: {
         ...editFormulModal,
         visible: false,
-        formulaId: "",
+        formulaId: "", name: "",
         valueType: "", dataType: ""
       }
     });
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
index fe601cc5..9e407f56 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
@@ -8,7 +8,8 @@ export default class CustomSalaryItemSlide extends React.Component {
     super(props);
     this.state = {
       showForm: false,
-      formalModalVisible: false
+      formalModalVisible: false,
+      salaryItemName: ""
     };
   }
 
@@ -16,9 +17,10 @@ export default class CustomSalaryItemSlide extends React.Component {
     this.props.onChange({ ...this.props.request, ...params });
   };
 
-  handleShowFormal = () => {
+  handleShowFormal = (salaryItemName) => {
     this.setState({
-      formalModalVisible: true
+      formalModalVisible: true,
+      salaryItemName
     });
   };
 
@@ -34,12 +36,13 @@ export default class CustomSalaryItemSlide extends React.Component {
   render() {
     const { request } = this.props;
     const { valueType, dataType, formulaId } = request;
-    const { formalModalVisible } = this.state;
+    const { formalModalVisible, salaryItemName } = this.state;
     return (
       <div className="customSalaryItemSlide">
         <SalaryItemForm {...this.props} onChangeFieldsItem={this.handleChange} onShowFormal={this.handleShowFormal}/>
         {formalModalVisible &&
           <FormalFormModal
+            name={salaryItemName}
             formulaId={formulaId}
             visible={formalModalVisible}
             valueType={valueType}
@@ -49,7 +52,8 @@ export default class CustomSalaryItemSlide extends React.Component {
             }}
             onCancel={() =>
               this.setState({
-                formalModalVisible: false
+                formalModalVisible: false,
+                salaryItemName: ""
               })}
           />}
       </div>
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
index 58808c61..98c706fc 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
@@ -208,7 +208,7 @@ export default class FormalFormModal extends React.Component {
     });
     this.parameters = result;
     let params = {
-      name: "公式1",
+      name: this.props.name || "公式1",
       description: "备注",
       module: "salary",
       useFor: "salaryitem",
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
index 73418bad..16a8a099 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
@@ -133,7 +133,7 @@ class SalaryItemForm extends Component {
                 (type === "INPUT" && display) ?
                   <WeaFormItem label={label} labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>
                     <WeaInput viewAttr={viewAttr} value={value}
-                              onClick={() => (key === "originSqlContent" || key === "originFormulaContent") && onShowFormal()}
+                              onClick={() => (key === "originSqlContent" || key === "originFormulaContent") && onShowFormal(request["name"])}
                               onChange={v => this.handleChangeSalaryFiledItems(key, v)}/></WeaFormItem> :
                   (type === "SWITCH" && display) ?
                     <WeaFormItem label={label} labelCol={{ span: 6 }} wrapperCol={{ span: 12 }}>