系统bug处理
This commit is contained in:
parent
266681cbc8
commit
57da206fcb
|
|
@ -216,7 +216,7 @@ export default class PayrollGrant extends React.Component {
|
|||
|
||||
getColumns = () => {
|
||||
const { payrollStore } = this.props;
|
||||
const { salaryGrantTableStore: columns,salarySendDetailBaseInfo } = payrollStore;
|
||||
const { salaryGrantTableStore: columns, salarySendDetailBaseInfo } = payrollStore;
|
||||
const notShowGrantOrWithdraw = salarySendDetailBaseInfo.haveBackCalc === 1 && salarySendDetailBaseInfo.salaryAcctType === "0";
|
||||
return [
|
||||
...toJS(columns),
|
||||
|
|
@ -234,7 +234,7 @@ export default class PayrollGrant extends React.Component {
|
|||
撤回
|
||||
</a>
|
||||
);
|
||||
} else if(!notShowGrantOrWithdraw) {
|
||||
} else if (!notShowGrantOrWithdraw) {
|
||||
return (
|
||||
<a
|
||||
href="javascript:void(0);"
|
||||
|
|
@ -289,7 +289,7 @@ export default class PayrollGrant extends React.Component {
|
|||
/>,
|
||||
...btnDom
|
||||
];
|
||||
} else if(selectedKey === "1" && !notShowGrantOrWithdraw) {
|
||||
} else if (selectedKey === "1" && !notShowGrantOrWithdraw) {
|
||||
btnDom = [
|
||||
<ButtonSelect
|
||||
datas={[
|
||||
|
|
@ -453,10 +453,7 @@ export default class PayrollGrant extends React.Component {
|
|||
<div className="titleBar">
|
||||
<div className="titleBarLeft">
|
||||
<span>
|
||||
薪资所属月:{salarySendDetailBaseInfo.salaryMonth &&
|
||||
salarySendDetailBaseInfo.salaryMonth
|
||||
.year}-{salarySendDetailBaseInfo.salaryMonth &&
|
||||
salarySendDetailBaseInfo.salaryMonth.monthValue}
|
||||
薪资所属月:{salarySendDetailBaseInfo.salaryMonth}
|
||||
</span>
|
||||
<WeaHelpfulTip
|
||||
style={{ marginLeft: "1rem", marginRight: "1rem" }}
|
||||
|
|
|
|||
Loading…
Reference in New Issue