From 3068ee9cd852352836541df49b3c6b4de81d3175 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, 25 Nov 2022 17:56:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js | 1 +
 pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js       | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
index 34df10d7..12615aac 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
@@ -233,6 +233,7 @@ export default class CustomSalaryItemSlide extends React.Component {
             formulaId={formulaId}
             visible={formalModalVisible}
             valueType={valueType}
+            dataType={dataType}
             onSaveFormal={data => {
               this.handleSaveFormal(data);
             }}
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
index f2d1e100..3ddf0cad 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
@@ -185,8 +185,8 @@ export default class FormalFormModal extends React.Component {
       description: "备注",
       module: "salary",
       useFor: "salaryitem",
-      returnType: "number",
-      validateType: "number",
+      returnType: this.props.dataType,
+      validateType: this.props.dataType,
       extendParam: JSON.stringify(this.state.extendParam),
       formula: this.state.value,
       parameters: this.parameters,