产品-社保档案基础信息修改

pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js

@@ -67,7 +67,7 @@ class LedgerSalaryItemTable extends Component {
     const { dataSource, onHandleItemhide } = this.props;
     onHandleItemhide(
       _.map([...dataSource], item => {
-        if (id === item.id || id === item.key) {
+        if (id === item.salaryItemId) {
           return {
             ...item,
             ...data
@@ -84,33 +84,52 @@ class LedgerSalaryItemTable extends Component {
    * Date: 2023/7/19
    */
   handleEditSalaryItem = async (record) => {
-    const { salarySobId, dataSource } = this.props, { salaryItemId } = record;
+    const { salarySobId, dataSource } = this.props, { salaryItemId, id } = record;
     const {
       itemHide: hideDefault,
-      valueType,
-      roundingMode,
-      pattern
+      valueType, name, description,
+      roundingMode, formulaId, dataType,
+      pattern, canEdit, formulaContent
     } = _.find(dataSource, it => it.salaryItemId === salaryItemId);
     const { data: userStatusList } = await commonEnumList({ enumClass: "com.engine.salary.enums.sicategory.SharedTypeEnum" });
-    getSalaryItemForm({ salarySobId, salaryItemId }).then(({ status, data }) => {
-      if (status) {
-        this.setState({
-          salaryItemPayload: {
-            ...this.state.salaryItemPayload,
-            visible: true,
-            request: {
-              ...data,
-              hideDefault: _.isNil(hideDefault) ? "0" : hideDefault,
-              valueType,
-              roundingMode,
-              pattern
-            },
-            record,
-            userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel }))
-          }
-        }, () => console.log(111, this.state.salaryItemPayload));
-      }
-    });
+    if (id) {
+      getSalaryItemForm({ salarySobId, salaryItemId }).then(({ status, data }) => {
+        if (status) {
+          this.setState({
+            salaryItemPayload: {
+              ...this.state.salaryItemPayload,
+              visible: true,
+              request: {
+                ...data,
+                hideDefault: _.isNil(hideDefault) ? "0" : hideDefault,
+                valueType,
+                roundingMode,
+                pattern
+              },
+              record,
+              userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel }))
+            }
+          });
+        }
+      });
+    } else {
+      this.setState({
+        salaryItemPayload: {
+          ...this.state.salaryItemPayload,
+          visible: true,
+          request: {
+            canEdit, dataType, description,
+            formulaContent, formulaId, name,
+            hideDefault: _.isNil(hideDefault) ? "0" : hideDefault,
+            valueType,
+            roundingMode,
+            pattern
+          },
+          record,
+          userStatusList: _.map(userStatusList, it => ({ key: it.value.toString(), showname: it.defaultLabel }))
+        }
+      });
+    }
   };
   /*
    * Author: 黎永顺
@@ -124,7 +143,7 @@ class LedgerSalaryItemTable extends Component {
     this.setState({
       salaryItemPayload: { ...salaryItemPayload, visible: false }
     });
-    const { id } = record;
+    const { salaryItemId } = record;
     const {
       hideDefault,
       roundingMode,
@@ -141,7 +160,7 @@ class LedgerSalaryItemTable extends Component {
       valueType,
       formulaContent: valueType.toString() === "2" ? originFormulaContent : originSqlContent,
       formulaId: ((valueType.toString() === "3" && !originSqlContent) || valueType.toString() === "1") ? "" : formulaId
-    }, id);
+    }, salaryItemId);
   };
   handleEditFormnul = () => {
     const { salaryItemPayload, editFormulModal } = this.state;
@@ -290,7 +309,6 @@ class LedgerSalaryItemTable extends Component {
         <LedgerSalaryItemEditSlide
           {...salaryItemPayload}
           onUpdateRequest={(request, key) => {
-            console.log(salaryItemPayload);
             this.setState({
               salaryItemPayload: {
                 ...salaryItemPayload, request,

pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js

@@ -132,8 +132,6 @@ class LedgerSlide extends Component {
       }) || [],
       salarySobId: salarySobId || saveSalarySobId
     };
-    console.log("payload", payload);
-    // return;
     this.setState({ loading: true });
     saveLedgerItem(payload).then(({ status, errormsg }) => {
       this.setState({ loading: false });

pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js

@@ -25,7 +25,11 @@ export default class CustomSalaryItemSlide extends React.Component {
 
   // 保存公式成功回调
   handleSaveFormal = (data) => {
-    this.handleChange({ formulaId: data.id, formulaContent: data.formula });
+    this.handleChange({
+      formulaId: data.id, formulaContent: data.formula,
+      originFormulaContent: data.referenceType === "formula" ? data.formula : "",
+      originSqlContent: data.referenceType === "sql" ? data.formula : ""
+    });
   };
 
   render() {