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

Merge branch 'fenquan' of https://gitee.com/MustangDeng/salary-management-front-end into fenquan

This commit is contained in:
MustangDeng 2022-06-09 18:30:39 +08:00
parent aebb43b461 cd801cb5c7
commit 47af2543b0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/hrmSalary/pages/ledger/index.js
View File

@ -359,11 +359,11 @@ export default class Ledger extends React.Component {
total: pageObj.total,
showTotal: (total) => `共 ${total} 条`,
showSizeChanger: true,
onShowSizeChange(current, pageSize) {
onShowSizeChange: (current, pageSize) => {
setPageObj({ ...pageObj, current, pageSize });
getTableDatas({ current, pageSize, name: this.state.searchValue });
},
onChange(current) {
onChange: (current) => {
setPageObj({ ...pageObj, current, pageSize: pageObj.pageSize });
getTableDatas({
current,

4
pc4mobx/hrmSalary/pages/ledger/slideBaseForm.js
View File

@ -75,7 +75,7 @@ export default class SlideBaseForm extends React.Component {
const { baseInfoRequest } = ledgerStore;
const { taxAgentOption } = taxAgentStore;
const {
canEdit="true",
canEdit = "true",
name,
taxAgentId,
taxableItems,
@ -115,7 +115,7 @@ export default class SlideBaseForm extends React.Component {
</Col>
<Col span={18}>
<WeaSelect
disabled={canEdit !== "true" || edit}
disabled={canEdit !== "true" || (taxAgentId ? edit : false)}
showSearch // 设置select可搜索
style={{ width: 190 }}
options={taxAgentOption}