From a348e5e3dbd054775899099439507848857a4477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Wed, 9 Nov 2022 14:37:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9A=84sql=E6=B7=BB=E5=8A=A0=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E8=A7=A3=E5=AF=86=E7=9A=84=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pc4mobx/hrmSalary/pages/ruleConfig/index.js | 6 +++--- .../hrmSalary/pages/salaryItem/formalFormModal.js | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) 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 { /> +