Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into develop

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,

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 = () => {

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: {

pc4mobx/hrmSalary/stores/salaryItem.js

@@ -274,9 +274,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) {