diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemModal.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemModal.js index 7a6e5557..1eea09a3 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemModal.js +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemModal.js @@ -20,7 +20,7 @@ class SalaryItemModal extends Component { onCancel={onCancel} title={title} visible={visible} - style={{ width: 500 }} + style={{ width: 600 }} hasScroll buttons={buttons} initLoadCss diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js index b2865829..bdd1b1c8 100644 --- a/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js +++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js @@ -6,7 +6,7 @@ */ import React, { Component } from "react"; import { toJS } from "mobx"; -import { WeaFormItem, WeaInput, WeaSelect, WeaSortable } from "ecCom"; +import { WeaFormItem, WeaInput, WeaSortable, WeaTransfer } from "ecCom"; import { Icon, Modal } from "antd"; import SalaryItemModal from "./salaryItemModal"; import { getAvailableSalaryGroupSet, getAvailableSalaryItemSet } from "../../../apis/payroll"; @@ -134,7 +134,7 @@ class SalaryItemSettings extends Component { visible: true, title, groupId: record.groupId, - options: _.map(data, it => ({ ...it, showname: it.name, key: it.salaryItemId })) + options: _.map(data, it => ({ ...it, name: it.name, id: it.salaryItemId })) } }); } @@ -155,7 +155,7 @@ class SalaryItemSettings extends Component { ...modalPayload, visible: true, title, - options: _.map(data, it => ({ ...it, showname: it.groupName, key: it.groupId })) + options: _.map(data, it => ({ ...it, name: it.groupName, id: it.groupId })) } }); } @@ -269,12 +269,10 @@ class SalaryItemSettings extends Component { - : this.setState({ checkedValue: v })} + : this.setState({ checkedValue: v.join(",") })} /> }