qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

禅道bug132、133

This commit is contained in:
黎永顺 2022-11-21 17:50:06 +08:00
parent 5619598e7e
commit 04a368c731
5 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/components/editSlideContent.js
View File

@ -86,27 +86,32 @@ export default class EditSlideContent extends React.Component {
};
render() {
const {
taxAgentStore: { taxAgentOption }
} = this.props;
const { cumDeductStore } = this.props;
const {
slideTableStore,
currentRecord,
slideColumns,
slidePageObj,
slideTableDataSource,
setSlidePageObj,
slideLoading
slideLoading,
getCumDeductDetailList
} = cumDeductStore;
const { startDate, endDate, taxAgentId } = this.state;
const declareMonth = [startDate, endDate];
const pagination = {
current: slidePageObj.current,
pageSize: slidePageObj.pageSize,
total: slidePageObj.total,
showTotal: (total) => `共 ${total} 条`,
showSizeChanger: true,
onShowSizeChange(current, pageSize) {
setSlidePageObj({ ...slidePageObj, current, pageSize });
getCumDeductDetailList(currentRecord.id, {
...slidePageObj,
current,
pageSize,
declareMonth: _.filter(declareMonth, item => item)
});
},
onChange(current) {
setSlidePageObj({
@ -114,6 +119,10 @@ export default class EditSlideContent extends React.Component {
current,
pageSize: slidePageObj.pageSize
});
getCumDeductDetailList(currentRecord.id, {
...slidePageObj, current,
declareMonth: _.filter(declareMonth, item => item)
});
}
};
const newColumns = _.map([...slideColumns], (item) => ({ ...item }));
@ -169,19 +178,6 @@ export default class EditSlideContent extends React.Component {
</div>
</div>
</Col>
{/*<Col span={8}>*/}
{/* <span className="formLabel">个税扣缴义务人</span>*/}
{/* <WeaSelect*/}
{/* showSearch // 设置select可搜索*/}
{/* style={{ width: 100 }}*/}
{/* options={taxAgentOption}*/}
{/* value={taxAgentId}*/}
{/* onChange={(v) => {*/}
{/* this.setState({ taxAgentId: v });*/}
{/* this.handleFetchCumDeductDetailList(startDate, endDate, v);*/}
{/* }}*/}
{/* />*/}
{/*</Col>*/}
</Row>
<div>

38
pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/editSlideContent.js
View File

@ -86,12 +86,10 @@ export default class EditSlideContent extends React.Component {
};
render() {
const {
taxAgentStore: { taxAgentOption }
} = this.props;
const { cumSituationStore } = this.props;
const { startDate, endDate, taxAgentId } = this.state;
const {
slideTableStore,
getCumDeductDetailList,
currentRecord,
slideColumns,
slidePageObj,
@ -99,14 +97,22 @@ export default class EditSlideContent extends React.Component {
setSlidePageObj,
slideLoading
} = cumSituationStore;
const { startDate, endDate, taxAgentId } = this.state;
const declareMonth = [startDate, endDate];
const pagination = {
current: slidePageObj.current,
pageSize: slidePageObj.pageSize,
total: slidePageObj.total,
showTotal: (total) => `共 ${total} 条`,
showSizeChanger: true,
onShowSizeChange(current, pageSize) {
setSlidePageObj({ ...slidePageObj, current, pageSize });
getCumDeductDetailList(currentRecord.id, {
...slidePageObj,
current,
pageSize,
declareMonth: _.filter(declareMonth, item => item)
});
},
onChange(current) {
setSlidePageObj({
@ -114,6 +120,12 @@ export default class EditSlideContent extends React.Component {
current,
pageSize: slidePageObj.pageSize
});
getCumDeductDetailList(currentRecord.id, {
...slidePageObj,
current,
pageSize,
declareMonth: _.filter(declareMonth, item => item)
});
}
};
const newColumns = _.map([...slideColumns], (item) => ({ ...item }));
@ -170,22 +182,6 @@ export default class EditSlideContent extends React.Component {
</div>
</div>
</Col>
{/*<Col span={8}>*/}
{/* <span className="formLabel">个税扣缴义务人</span>*/}
{/* <WeaSelect*/}
{/* showSearch // 设置select可搜索*/}
{/* style={{ width: 100 }}*/}
{/* options={taxAgentOption}*/}
{/* value={taxAgentId}*/}
{/* onChange={(v) => {*/}
{/* this.setState({ taxAgentId: v });*/}
{/* this.fetchCumDeductDetailList({*/}
{/* declareMonth: [startDate, endDate],*/}
{/* taxAgentId: v,*/}
{/* });*/}
{/* }}*/}
{/* />*/}
{/*</Col>*/}
</Row>
<div>

19
pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/editSlideContent.js
View File

@ -92,12 +92,9 @@ export default class EditSlideContent extends React.Component {
};
render() {
const {
taxAgentStore: { taxAgentOption },
} = this.props;
const { otherDeductStore } = this.props;
const {
slideTableStore,
getOtherDeductDetailList,
currentRecord,
slideColumns,
slidePageObj,
@ -106,13 +103,22 @@ export default class EditSlideContent extends React.Component {
slideLoading,
} = otherDeductStore;
const { startDate, endDate, taxAgentId } = this.state;
const declareMonth = [startDate, endDate];
const pagination = {
current: slidePageObj.current,
pageSize: slidePageObj.pageSize,
total: slidePageObj.total,
showTotal: (total) => `共 ${total} 条`,
showSizeChanger: true,
onShowSizeChange(current, pageSize) {
setSlidePageObj({ ...slidePageObj, current, pageSize });
getOtherDeductDetailList(currentRecord.id, {
...slidePageObj,
current,
pageSize,
declareMonth: _.filter(declareMonth, item => item)
});
},
onChange(current) {
setSlidePageObj({
@ -120,6 +126,11 @@ export default class EditSlideContent extends React.Component {
current,
pageSize: slidePageObj.pageSize,
});
getOtherDeductDetailList(currentRecord.id, {
...slidePageObj,
current,
declareMonth: _.filter(declareMonth, item => item)
});
},
};
const newColumns = _.map([...slideColumns], (item) => ({ ...item }));

5
pc4mobx/hrmSalary/pages/payrollFiles/index.js
View File

@ -472,7 +472,7 @@ class Index extends Component {
...item,
width: item.oldWidth,
render: (text) => {
return <span className='tdEllipsis' title={text}>{text}</span>
return <span className="tdEllipsis" title={text}>{text}</span>;
}
};
});
@ -526,7 +526,8 @@ class Index extends Component {
let arrList = [];
if (showOperateBtn && isShow === "true" && selectedKey === "fixed") {
arrList.push(<Button type="primary" onClick={() => {
window.open(`${url}&salaryArchiveId=${id}`);
const linkUrl = url.indexOf("http") !== -1 ? url : `${window.location.origin}${url}`;
window.open(`${linkUrl}&salaryArchiveId=${id}`);
}}>发起调薪</Button>);
}
if (showOperateBtn && selectedKey === "fixed") {

2
pc4mobx/hrmSalary/stores/cumDeduct.js
View File

@ -191,7 +191,7 @@ export class CumDeductStore {
pageSize
});
} else {
this.setSlideTableDataSource(list);
this.setSlideTableDataSource([]);
this.setSlidePageObj({
...this.slidePageObj,
total: 0