From ac37e9b16d11a4b9aece50f10c6d5cffed4497fa 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, 21 Jul 2023 15:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84=E8=B4=A6?=
 =?UTF-8?q?=E5=A5=97=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E9=A1=B9=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=BC=96=E8=BE=91=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ledgerSalaryItemEditSlide.js   |  3 ++-
 .../components/ledgerSalaryItemTable.js       | 22 ++++++++++++++++---
 .../pages/salaryItem/salaryItemForm.js        |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js
index 3e461453..fa968445 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemEditSlide.js
@@ -20,6 +20,7 @@ class LedgerSalaryItemEditSlide extends Component {
 
   handleChange = (params) => {
     const request = { ...this.props.request, ...params };
+    console.log(this.props.request, params);
     this.props.onUpdateRequest(request);
   };
   handleShowFormal = () => this.props.onEditFormnul();
@@ -34,7 +35,7 @@ class LedgerSalaryItemEditSlide extends Component {
         title={
           <SlideModalTitle
             subtitle={getLabel(111, "编辑薪资项目")} showOperateBtn
-            loading={false} editable onSave={this.props.onSave}
+            loading={this.props.loading} editable onSave={this.props.onSave}
           />
         }
         content={
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
index cc3254a4..e33d7ce3 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -22,7 +22,7 @@ class LedgerSalaryItemTable extends Component {
       salaryItemPayload: {
         visible: false, record: {},
         request: {}, isLedger: true,
-        userStatusList: []
+        userStatusList: [], loading: false
       }
     };
   }
@@ -38,6 +38,7 @@ class LedgerSalaryItemTable extends Component {
     onHandleItemhide(
       _.map([...dataSource], item => {
         if (id === item.id || id === item.key) {
+          alert(1);
           return {
             ...item,
             itemHide: String(value)
@@ -86,15 +87,30 @@ class LedgerSalaryItemTable extends Component {
    */
   handleSaveItem = () => {
     const { salaryItemPayload } = this.state;
-    const { request } = salaryItemPayload;
+    const { request, record } = salaryItemPayload;
+    this.setState({
+      salaryItemPayload: { ...salaryItemPayload, loading: true }
+    });
     saveItem(request).then(({ status, errorMsg }) => {
       if (status) {
         message.success(getLabel(22619, "保存成功"));
+        this.setState({
+          salaryItemPayload: { ...salaryItemPayload, loading: false, visible: false }
+        });
+        const { id } = record;
+        const { hideDefault } = request;
+        this.handleChangeItem(hideDefault.toString(), id);
+        console.log(this.props, this.state);
         //TODO:渲染列表数据
       } else {
+        this.setState({
+          salaryItemPayload: { ...salaryItemPayload, loading: false }
+        });
         message.error(errorMsg || getLabel(22620, "保存失败"));
       }
-    });
+    }).catch(() => this.setState({
+      salaryItemPayload: { ...salaryItemPayload, loading: false }
+    }));
   };
 
   render() {
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
index 3a348a5e..333991c6 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
@@ -92,7 +92,7 @@ class SalaryItemForm extends Component {
         return { ...item };
       })
     }, () => {
-      if (key === "valueType") {
+      if (key === "valueType" && !this.props.isLedger) {
         onChangeFieldsItem({ formulaContent: "", formulaId: 0, valueType: v });
       } else {
         onChangeFieldsItem({ [key]: (key === "useDefault" || key === "useInEmployeeSalary" || key === "hideDefault") ? Number(v) : v });