From f914a9ee46c4eacbbd95203ea88a3f701320fe4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 26 May 2023 15:51:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E5=85=AC?=
 =?UTF-8?q?=E5=BC=8F=E6=B5=8B=E8=AF=95=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrmSalary/pages/salaryItem/formalFormModal.js    | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
index 1dcfce4a..a7044fd0 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
@@ -341,9 +341,9 @@ export default class FormalFormModal extends React.Component {
     const title = <div className="formulaTitleWrapper">
       <div>{`${(this.props.valueType == 2 || this.props.valueType === "FORMULA") ? "函数" : "SQL"}公式`}</div>
       {
-        !_.isEmpty(this.parameters) && <Button type="primary" onClick={() => {
+        !_.isEmpty(value) && <Button type="primary" onClick={() => {
           const isSaveBool = _.every(this.parameters, it => !!it.id);
-          if (isSaveBool && value === formula) {
+          if (value === formula) {
             this.setState({ testVisible: true });
           } else {
             message.info("请先保存公式后再进行测试");
@@ -359,15 +359,11 @@ export default class FormalFormModal extends React.Component {
     </div>;
     return (
       <WeaDialog
-        title={title}
-        hasScroll
-        visible={this.props.visible}
-        style={{ width: 1000 }}
+        title={title} hasScroll scalable className="formula-wrapper" initLoadCss
+        visible={this.props.visible} style={{ width: 1000 }}
         buttons={[
           <Button type="primary" onClick={this.handleSave}>保存</Button>
         ]}
-        className="formula-wrapper"
-        initLoadCss
         onCancel={() => {
           this.props.onCancel();
         }}>