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

Merge branch 'hotfix/V2-0209' into develop

This commit is contained in:
黎永顺 2023-02-09 19:45:29 +08:00
parent 5e1cec5324 8416f73376
commit faafd9874d
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
View File

@ -65,26 +65,29 @@ export default class CustomSalaryItemSlide extends React.Component {
/>
</Col>
</Row>
<Row className="formItem">
<Col span={4}>薪资档案引用</Col>
<Col span={20}>
<Switch
disabled={
!((editable && this.props.record.canEdit) || isAdd)
}
checked={useInEmployeeSalary == 1}
onChange={value => {
this.handleChange({ useInEmployeeSalary: value ? 1 : 0 });
}}
/>
<WeaHelpfulTip
style={{ marginLeft: "10px" }}
width={200}
title="提示：开启后，该薪资项目不可删除或设为无效，取值方式会默认置为输入"
placement="topLeft"
/>
</Col>
</Row>
{
!isAdd &&
<Row className="formItem">
<Col span={4}>薪资档案引用</Col>
<Col span={20}>
<Switch
disabled={
!((editable && this.props.record.canEdit) || isAdd)
}
checked={useInEmployeeSalary == 1}
onChange={value => {
this.handleChange({ useInEmployeeSalary: value ? 1 : 0 });
}}
/>
<WeaHelpfulTip
style={{ marginLeft: "10px" }}
width={200}
title="提示：开启后，该薪资项目不可删除或设为无效，取值方式会默认置为输入"
placement="topLeft"
/>
</Col>
</Row>
}
<Row className="formItem">
<Col span={4}>默认使用</Col>
<Col span={20}>
@ -159,7 +162,7 @@ export default class CustomSalaryItemSlide extends React.Component {
<Col span={8}>字段类型</Col>
<Col span={16}>
<WeaSelect
disabled={isAdd ? false : true}
disabled={!((editable && this.props.record.canEdit) || isAdd)}
value={dataType}
viewAttr={3}
options={dataTypeOptions}

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

@ -257,7 +257,7 @@ export class SalaryItemStore {
return false;
}
if (params.sharedType && !notNull(params.taxAgentIds)) {
if (params.sharedType == 1 && !notNull(params.taxAgentIds)) {
message.warning("可见性范围不能为空");
return false;
}