Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into develop

# Conflicts: # pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
2023-08-01 16:10:29 +08:00 · 2023-08-01 16:10:29 +08:00 · cb94dabd30
parent dbae61623d 5eec7139d6
commit cb94dabd30
1 changed files with 1 additions and 0 deletions
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
@ -270,6 +270,7 @@ class SalaryItemSettings extends Component {
    }, () => {
      const modifySalaryItemids = _.reduce(this.state.itemShowNamesetting, (pre, cur) => [...pre, cur.salaryItemId], []);
      const convertDataList = _.map(this.state.dataList, it => {
+        if (it.groupId === "111111111111111111") return { ...it };
        return {
          ...it,
          items: _.map(it.items, item => {