From 3d67ee671feead0351d895a7650b2b9bdf876e20 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, 1 Mar 2023 18:07:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=BC=95=E7=94=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js | 2 +-
 .../attendance/components/attendanceCustomFieldsModal.js      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js
index 08e83263..2adb437b 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js
@@ -91,6 +91,7 @@ export const conditions = [
         isQuickSearch: false,
         label: "类型",
         labelcol: 6,
+        valueList:[],
         options: [
           {
             key: "NUMBER",
@@ -110,7 +111,6 @@ export const conditions = [
         conditionType: "SWITCH",
         domkey: ["enableStatus"],
         fieldcol: 14,
-        isQuickSearch: false,
         label: "是否启用",
         labelcol: 6,
         viewAttr: 3,
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js
index 0e6d7ab3..0bbc46f0 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js
@@ -22,7 +22,7 @@ class AttendanceCustomFieldsModal extends Component {
   }
 
   componentWillReceiveProps(nextProps, nextContext) {
-    if (nextProps.visible !== this.props.visible) this.handleResetForm();
+    if (nextProps.visible !== this.props.visible && nextProps.visible) this.handleResetForm();
   }
 
 
@@ -53,7 +53,7 @@ class AttendanceCustomFieldsModal extends Component {
   };
   handleResetForm = () => {
     const { attendanceStore: { form } } = this.props;
-    form.resetForm();
+    form.updateFields({ fieldName: "", fieldType: "NUMBER", enableStatus: "0", description: "" });
   };
 
   render() {