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 09:49:28 +08:00
parent b54cb8d226 010c3c9c96
commit bab032c4a7
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
View File

@ -21,7 +21,8 @@ class FieldSlide extends Component {
this.state = {
loading: false,
name: "",
useDefault: "",
useInEmployeeSalary: "0",
useDefault: "0",
sharedType: "",
shareTypeList: [],
taxAgentIds: "",
@ -139,7 +140,8 @@ class FieldSlide extends Component {
handleReset = () => {
this.setState({
name: "",
useDefault: "",
useDefault: "0",
useInEmployeeSalary: "0",
sharedType: "",
taxAgentIds: "",
dataType: "number",
@ -154,6 +156,7 @@ class FieldSlide extends Component {
const {
loading,
name,
useInEmployeeSalary,
useDefault,
shareTypeList,
sharedType,
@ -189,6 +192,17 @@ class FieldSlide extends Component {
style={{ width: "80%" }}
onChange={value => this.handleChangeFields("name", value)}/>
</WeaFormItem>
<WeaFormItem label="薪资档案引用" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
<WeaCheckbox
value={useInEmployeeSalary}
display="switch"
onChange={value => this.handleChangeFields("useInEmployeeSalary", value)}
/>
<WeaHelpfulTip style={{ marginLeft: "10px" }} width={200}
title="提示：开启后，该薪资项目不可删除或设为无效，取值方式会默认置为输入"
placement="topLeft"
/>
</WeaFormItem>
<WeaFormItem label="默认使用" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}>
<WeaCheckbox
value={useDefault}

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

@ -65,26 +65,26 @@ 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>*/}
<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}>