diff --git a/pc4mobx/hrmSalary/pages/ledger/index.js b/pc4mobx/hrmSalary/pages/ledger/index.js index 738d0979..eddcf968 100644 --- a/pc4mobx/hrmSalary/pages/ledger/index.js +++ b/pc4mobx/hrmSalary/pages/ledger/index.js @@ -108,6 +108,8 @@ export default class Ledger extends React.Component { return {this.handleItemClick(record)}}>{text} case "disable": return {this.handleItemStatusChange(value, record)}}/> + case "operate": + return {this.handleItemClick(record, 1)}}>关联人员 default: return
} diff --git a/pc4mobx/hrmSalary/pages/ledger/slideBaseForm.js b/pc4mobx/hrmSalary/pages/ledger/slideBaseForm.js index 318c78c6..982f3fa5 100644 --- a/pc4mobx/hrmSalary/pages/ledger/slideBaseForm.js +++ b/pc4mobx/hrmSalary/pages/ledger/slideBaseForm.js @@ -18,9 +18,12 @@ export default class SlideBaseForm extends React.Component { } componentWillMount() { const { edit } = this.props; + const { ledgerStore: {initBaseInfoRequest}} = this.props; if(edit) { const { ledgerStore: { getLedgerBasicForm }} = this.props; getLedgerBasicForm() + } else { + initBaseInfoRequest(); } } diff --git a/pc4mobx/hrmSalary/pages/ledger/step4/RuleEditModal.js b/pc4mobx/hrmSalary/pages/ledger/step4/RuleEditModal.js index 6d54fc9a..05e717fe 100644 --- a/pc4mobx/hrmSalary/pages/ledger/step4/RuleEditModal.js +++ b/pc4mobx/hrmSalary/pages/ledger/step4/RuleEditModal.js @@ -14,13 +14,18 @@ export default class RuleEditModal extends React.Component { itemValue: "", effectiveDate: "", beforeAdjustmentType: 1, - afterAdjustmentType: 1 + afterAdjustmentType: 1, + initedSelect: false } } componentWillMount() { const { ledgerStore: {listSalarySobItem}} = this.props; - listSalarySobItem(); + listSalarySobItem().then(() => { + this.setState({ + initedSelect: true + }) + }) } beforeAdjustmentTypeChange(e) { @@ -32,7 +37,6 @@ export default class RuleEditModal extends React.Component { } handleSave() { - const { ledgerStore } = this.props; const { ruleOptionList } = ledgerStore; let salaryItemName = "" @@ -54,7 +58,7 @@ export default class RuleEditModal extends React.Component { render() { const { ledgerStore } = this.props; const { ruleOptionList } = ledgerStore; - const { beforeAdjustmentType, afterAdjustmentType } = this.state + const { beforeAdjustmentType, afterAdjustmentType, initedSelect } = this.state return ( {this.props.onCancel()}} width={800} footer={} @@ -65,7 +69,7 @@ export default class RuleEditModal extends React.Component { 薪资项目 { - ruleOptionList.length > 0 && + initedSelect && {this.setState({itemValue: value})} } /> } diff --git a/pc4mobx/hrmSalary/stores/ledger.js b/pc4mobx/hrmSalary/stores/ledger.js index 366d550f..63f34eee 100644 --- a/pc4mobx/hrmSalary/stores/ledger.js +++ b/pc4mobx/hrmSalary/stores/ledger.js @@ -176,6 +176,21 @@ export class LedgerStore { }) } + @action + initBaseInfoRequest = () => { + this.setBaseInfoRequest({ + name: "", + taxableItems: "1", + salaryCycleType: "1", + salaryCycleFromDay: "1", + taxCycleType: "1", + attendCycleType: "1", + attendCycleFromDay: "1", + socialSecurityCycleType: "1", + description: "" + }) + } + // 获得高级搜索表单数据 @action getCondition = () => { @@ -396,17 +411,24 @@ export class LedgerStore { salarySobId: this.salarySobId, excludeSalaryItemIds: this.sobItemRuleDataSource.map(item => item.salaryItemId) } - API.listSalarySobItem(params).then(res => { - if(res.status) { - this.ruleOptionList = res.data.map(item => { - return { - key: item.salaryItemId.toString(), - showname: item.salaryItemName, - selected: false - } - }) - } + return new Promise((resolve, reject) => { + API.listSalarySobItem(params).then(res => { + if(res.status) { + this.ruleOptionList = res.data.map(item => { + return { + key: item.salaryItemId.toString(), + showname: item.salaryItemName, + selected: false + } + }) + resolve() + } else { + reject() + message.error(res.errormsg || "获取失败") + } + }) }) + }