From 1ea8eb9e9dd3a645718334bfaf415fe86ac1c844 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 09:20:03 +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

---
 .../pages/fieldManagement/components/fieldSlide.js     | 10 +++++-----
 pc4mobx/hrmSalary/pages/fieldManagement/index.js       |  7 +++----
 pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js   |  6 ++----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
index cbc91000..6d9de67e 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
@@ -41,8 +41,8 @@ class FieldSlide extends Component {
   }
 
   componentWillReceiveProps(nextProps, nextContext) {
-    if (nextProps.editId !== this.props.editId && nextProps.editId) {
-      this.getSalaryFieldForm(nextProps.editId);
+    if (nextProps.record.id !== this.props.record.id && nextProps.record.id) {
+      this.getSalaryFieldForm(nextProps.record.id);
     }
   }
 
@@ -111,7 +111,7 @@ class FieldSlide extends Component {
       });
       return false;
     }
-    const { onRefreshList, onCancel, editId } = this.props;
+    const { onRefreshList, onCancel, record } = this.props;
     const {
       name,
       useDefault,
@@ -135,7 +135,7 @@ class FieldSlide extends Component {
       pattern: Number(pattern)
     };
     this.setState({ loading: true });
-    saveSalaryField({ ...payload, id: editId }).then(({ status, errormsg }) => {
+    saveSalaryField({ ...record, ...payload }).then(({ status, errormsg }) => {
       this.setState({ loading: false });
       if (status) {
         onRefreshList();
@@ -171,7 +171,7 @@ class FieldSlide extends Component {
   };
 
   render() {
-    const { title, visible, editId, taxAgentStore: { taxAgentOption }, onCancel } = this.props;
+    const { title, visible, record: { id: editId }, taxAgentStore: { taxAgentOption }, onCancel } = this.props;
     const {
       loading,
       name,
diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/index.js b/pc4mobx/hrmSalary/pages/fieldManagement/index.js
index 04b177b1..b970bdd6 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/index.js
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/index.js
@@ -24,15 +24,14 @@ class FieldManagement extends Component {
       slideparams: {
         visible: false,
         title: "新建字段",
-        editId: ""
+        record: {}
       }
     };
   }
 
   handleEditField = (record) => {
     const { slideparams } = this.state;
-    const { id } = record;
-    this.setState({ slideparams: { ...slideparams, visible: true, title: "编辑字段", editId: id } });
+    this.setState({ slideparams: { ...slideparams, visible: true, title: "编辑字段", record } });
   };
   handleDeleteField = (filedIds) => {
     Modal.confirm({
@@ -57,7 +56,7 @@ class FieldManagement extends Component {
         ...slideparams,
         visible: false,
         title: "新建字段",
-        editId: ""
+        record: {}
       }
     });
   };
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
index 55b95397..97411b6a 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
@@ -47,15 +47,13 @@ class SalaryItemForm extends Component {
           case "valueType":
             return {
               ...item,
-              // viewAttr: isAdd ? 2 : 1
-              viewAttr: 2
+              viewAttr: isAdd ? 2 : 1
             };
           case "formulaContent":
             return {
               ...item,
               display: valueType === "2" || valueType === "3",
-              // viewAttr: (editable && record.canEdit) || isAdd ? 2 : 1
-              viewAttr: 2
+              viewAttr: (editable && record.canEdit) || isAdd ? 2 : 1
             };
           default:
             break;