diff --git a/pc4mobx/hrmSalary/pages/ruleConfig/index.js b/pc4mobx/hrmSalary/pages/ruleConfig/index.js index e440a1ce..485dd1dd 100644 --- a/pc4mobx/hrmSalary/pages/ruleConfig/index.js +++ b/pc4mobx/hrmSalary/pages/ruleConfig/index.js @@ -89,9 +89,9 @@ class Index extends Component { declareItems: [ { com: CheckBox({ - label: "取消报税", + label: "个税申报", value: queryAppsetting.data.isOpenTaxDeclaration, - onChange: (data) => this.handleChane({ type: "取消报税", selected: data }) + onChange: (data) => this.handleChane({ type: "个税申报", selected: data }) }) } ], @@ -270,7 +270,7 @@ class Index extends Component { this.setState({ saveParams: { ...this.state.saveParams, enctry: selected } }); - } else if (type === "取消报税") { + } else if (type === "个税申报") { this.setState({ saveParams: { ...this.state.saveParams, operateTaxDeclaration: selected } }); diff --git a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js index 5b01e4b1..187629e0 100644 --- a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js +++ b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js @@ -1,6 +1,6 @@ import React from "react"; import { Button, Col, Icon, Row } from "antd"; -import { WeaDialog, WeaFormItem, WeaHelpfulTip, WeaInput, WeaSelect, WeaTextarea } from "ecCom"; +import { WeaCheckbox, WeaDialog, WeaFormItem, WeaHelpfulTip, WeaInput, WeaSelect, WeaTextarea } from "ecCom"; import { inject, observer } from "mobx-react"; import "./index.less"; @@ -13,6 +13,7 @@ export default class FormalFormModal extends React.Component { value: "", extendParam: { sqlReturnKey: "", + openDecrypt: "0", datasource: { datasourceId: "" } @@ -49,6 +50,7 @@ export default class FormalFormModal extends React.Component { this.setState({ extendParam: { sqlReturnKey: extendParam.sqlReturnKey, + openDecrypt: extendParam.openDecrypt, datasource: { datasourceId: extendParam.datasource ? extendParam.datasource.datasourceId : "" } @@ -292,6 +294,17 @@ export default class FormalFormModal extends React.Component { /> +