From 7aee66760ea0443e29778e28b3abef46a879ff56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 17 Feb 2023 10:05:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BB=A5=E5=8F=8A=E5=AD=97=E6=AE=B5=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fieldManagement/components/fieldSlide.js      |  2 ++
 pc4mobx/hrmSalary/pages/fieldManagement/index.js  | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
index 6d9de67e..6775e651 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
@@ -49,6 +49,7 @@ class FieldSlide extends Component {
   getSalaryFieldForm = (id) => {
     getSalaryFieldForm({ id }).then(({ status, data }) => {
       if (status) {
+        const { onChangeRecord } = this.props;
         const {
           name,
           useDefault,
@@ -60,6 +61,7 @@ class FieldSlide extends Component {
           taxAgentIds,
           pattern
         } = data;
+        onChangeRecord(data);
         this.setState({
           name,
           useInEmployeeSalary: useInEmployeeSalary ? useInEmployeeSalary.toString() : "0",
diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/index.js b/pc4mobx/hrmSalary/pages/fieldManagement/index.js
index b970bdd6..a646ea38 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/index.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/index.js
@@ -31,7 +31,14 @@ class FieldManagement extends Component {
 
   handleEditField = (record) => {
     const { slideparams } = this.state;
-    this.setState({ slideparams: { ...slideparams, visible: true, title: "编辑字段", record } });
+    this.setState({
+      slideparams: {
+        ...slideparams,
+        visible: true,
+        title: "编辑字段",
+        record: _.pick(record, ["id"])
+      }
+    });
   };
   handleDeleteField = (filedIds) => {
     Modal.confirm({
@@ -90,6 +97,12 @@ class FieldManagement extends Component {
                       onDeleteLedger={(record) => this.handleDeleteField([record.id])}/>
           <FieldSlide
             {...slideparams}
+            onChangeRecord={(record) => this.setState({
+              slideparams: {
+                ...slideparams,
+                record: { ...slideparams.record, ...record }
+              }
+            })}
             onCancel={this.handleResetField}
             onRefreshList={() => this.setState({ doSearch: !doSearch })}
           />