diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js index 6af6af3a..cc6444fb 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js @@ -200,7 +200,15 @@ class LedgerSalaryItem extends Component { this.setState({ itemGroups: _.map(itemGroups, it => { if (filed.id === it.id) { - return { ...it, items: data }; + return { + ...it, + items: _.map(data, (child, childIndex) => { + return { + ...child, + sortedIndex: childIndex + }; + }) + }; } return { ...it }; }) diff --git a/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js b/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js index 060feaf6..6e7d0a52 100644 --- a/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js +++ b/pc4mobx/hrmSalary/pages/payroll/SalarySendList.js @@ -76,7 +76,7 @@ export default class SalarySendList extends React.Component { {text}
{ - record.sendStatus === 1 && + record.salaryAcctType === 1 && 补发 } {`第${record.acctTimes}次`} @@ -92,15 +92,18 @@ export default class SalarySendList extends React.Component { title: "操作", key: "operate", render: (text, record) => { - const { sendNum, sendTotal } = record; + const { sendNum, sendTotal, salaryAcctType } = record; return ( this.handleGrant(record)} style={{ marginRight: 10 }}>发放 - this.handleShowDetail(record)} - style={{ marginRight: 10 }}>查看详情 { - sendNum !== sendTotal && + salaryAcctType === 0 && + this.handleShowDetail(record)} + style={{ marginRight: 10 }}>查看详情 + } + { + sendNum !== sendTotal && salaryAcctType === 0 && this.handleUpdateTemplate(record)}>更新模板 } @@ -114,8 +117,14 @@ export default class SalarySendList extends React.Component { title: "操作", key: "operate", render: (text, record) => { + const { salaryAcctType } = record; return ( - this.handleShowDetail(record)}>查看详情 + + { + salaryAcctType === 0 && + this.handleShowDetail(record)}>查看详情 + } + ); } }