diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js index 1b70707f..0e5803e5 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js @@ -245,7 +245,7 @@ class SalaryItemSettings extends Component { }, () => document.getElementById("salaryItemInput") && document.getElementById("salaryItemInput").focus()); }; handleChangeSalaryItemShowName = (item, field, name) => { - const { groupId } = item, { salaryItemId } = field, { dataList, itemShowNamesetting } = this.state; + const { groupId } = item, { salaryItemId, originName } = field, { dataList, itemShowNamesetting } = this.state; this.setState({ dataList: _.map(dataList, item => { if (item.groupId === groupId) { @@ -261,7 +261,10 @@ class SalaryItemSettings extends Component { } return { ...item }; }), - itemShowNamesetting: _.unionBy([{ salaryItemId, salaryItemShowName: name }], itemShowNamesetting, "salaryItemId") + itemShowNamesetting: _.unionBy([{ + salaryItemId, + salaryItemShowName: originName === name ? "" : name + }], itemShowNamesetting, "salaryItemId") }, () => { this.props.onChangeSalaryItem(this.state.dataList); this.props.onChangeSalaryItemShowNamesetting(this.state.itemShowNamesetting); @@ -308,7 +311,7 @@ class SalaryItemSettings extends Component { title={ (item.groupId !== "111111111111111111" && (!_.isEmpty(salaryBillItemNameObj) || (filed.salaryItemShowName !== filed.originName))) ? `${filed.salaryItemShowName}(${filed.originName})` : - filed.salaryItemShowName + filed.name } > { @@ -328,7 +331,7 @@ class SalaryItemSettings extends Component { { (item.groupId !== "111111111111111111" && (!_.isEmpty(salaryBillItemNameObj) || (filed.salaryItemShowName !== filed.originName))) ? `${filed.salaryItemShowName}(${filed.originName})` : - filed.salaryItemShowName + filed.name } } diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js index 0c4c8c07..8bcb6aa8 100644 --- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js +++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/computerTemplate/index.js @@ -49,7 +49,7 @@ export default class ComputerTemplate extends React.Component { } - renderTableTr = (data) => { + renderTableTr = (data, groupId) => { const tables = []; const len = data.length; const rowNum = 3; @@ -61,8 +61,9 @@ export default class ComputerTemplate extends React.Component { iLen = iLen > len ? len : iLen; tables.push("