From fb40c1a998a276022ead358ea38b7cea34bf1046 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, 28 Jul 2023 16:28:27 +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=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ledgerSalaryItemTable.js       | 15 ++++------
 .../pages/salaryItem/customSalaryItemSlide.js |  3 +-
 pc4mobx/hrmSalary/pages/salaryItem/index.js   |  3 +-
 pc4mobx/hrmSalary/stores/salaryItem.js        | 29 +++++++++++++++++--
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
index 706e219e..1dcbf1b5 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -93,6 +93,7 @@ class LedgerSalaryItemTable extends Component {
     } = _.find(dataSource, it => it.salaryItemId === salaryItemId);
     const { data: userStatusList } = await commonEnumList({ enumClass: "com.engine.salary.enums.sicategory.SharedTypeEnum" });
     if (id) {
+      console.log("96", record, _.find(dataSource, it => it.salaryItemId === salaryItemId));
       getSalaryItemForm({ salarySobId, salaryItemId }).then(({ status, data }) => {
         if (status) {
           this.setState({
@@ -103,9 +104,7 @@ class LedgerSalaryItemTable extends Component {
                 ...data,
                 useInEmployeeSalary: !_.isNil(data.useInEmployeeSalary) ? data.useInEmployeeSalary : "0",
                 hideDefault: _.isNil(hideDefault) ? "0" : hideDefault,
-                valueType,
-                roundingMode,
-                pattern
+                valueType, roundingMode, pattern
               },
               record,
               userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel }))
@@ -146,14 +145,10 @@ class LedgerSalaryItemTable extends Component {
     });
     const { salaryItemId } = record;
     const {
-      hideDefault,
-      roundingMode,
-      pattern,
-      valueType,
-      originFormulaContent,
-      originSqlContent,
-      formulaId
+      hideDefault, roundingMode, pattern, valueType,
+      originFormulaContent, originSqlContent, formulaId
     } = request;
+    console.log("152", salaryItemPayload);
     this.handleChangeSalaryItem({
       itemHide: hideDefault.toString(),
       roundingMode,
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
index 97e5fb64..fe601cc5 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
@@ -13,8 +13,7 @@ export default class CustomSalaryItemSlide extends React.Component {
   }
 
   handleChange = (params) => {
-    let request = { ...this.props.request, ...params };
-    this.props.onChange(request);
+    this.props.onChange({ ...this.props.request, ...params });
   };
 
   handleShowFormal = () => {
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index a07c33b2..eb857912 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -274,6 +274,7 @@ export default class SalaryItem extends React.Component {
     // 新建和修改保存的回调
     const handleSlideSave = (continueFlag) => {
       const { salaryItemStore: { saveItem, request, getTableDatas } } = this.props;
+      const payload = _.cloneDeep(request);
       const { name, sharedType, taxAgentIds } = request;
       if (!name || (sharedType === "1" && !taxAgentIds)) {
         Modal.warning({
@@ -282,7 +283,7 @@ export default class SalaryItem extends React.Component {
         });
         return;
       }
-      saveItem(request, continueFlag).then(() => {
+      saveItem(payload, continueFlag).then(() => {
         getTableDatas({ ...this.state.searchParams }).then(res => {
           this.setState({
             searchParams: {
diff --git a/pc4mobx/hrmSalary/stores/salaryItem.js b/pc4mobx/hrmSalary/stores/salaryItem.js
index 775c464a..a8222a45 100644
--- a/pc4mobx/hrmSalary/stores/salaryItem.js
+++ b/pc4mobx/hrmSalary/stores/salaryItem.js
@@ -272,9 +272,34 @@ export class SalaryItemStore {
   @action
   saveItem = (params, continueFlag) => {
     return new Promise((resolve, reject) => {
-      if (!this.validateForm(params)) {
-        return;
+      const { valueType, formulaId, originFormulaContent, originSqlContent, ...extra } = params;
+      let payload = { ...extra, valueType };
+      if (valueType === "1") {
+        payload = {
+          ...payload,
+          formulaContent: "",
+          formulaId: "",
+          originSqlContent: "",
+          originFormulaContent: ""
+        };
+      } else if (valueType === "2") {
+        payload = {
+          ...payload,
+          formulaContent: originFormulaContent ? originFormulaContent : "",
+          formulaId: originFormulaContent ? formulaId : "",
+          originSqlContent: "",
+          originFormulaContent
+        };
+      } else if (valueType === "3") {
+        payload = {
+          ...payload,
+          formulaContent: originSqlContent ? originSqlContent : "",
+          formulaId: originSqlContent ? formulaId : "",
+          originFormulaContent: "",
+          originSqlContent
+        };
       }
+      if (!this.validateForm(payload)) return;
       API.saveItem(params).then(res => {
         if (res.status) {
           if (!continueFlag) {