From fe71ce161b9237335cc966bff87008acdc14da0d 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 16:28:34 +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

---
 .../dataAcquisition/attendance/columns.js     |  4 +-
 .../components/attendanceCustomFieldsModal.js | 42 +++++++++++++++++--
 .../attendance/components/fieldMangComp.js    |  5 ++-
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js
index e4aa75cc..08e83263 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js
@@ -93,12 +93,12 @@ export const conditions = [
         labelcol: 6,
         options: [
           {
-            key: "1",
+            key: "NUMBER",
             selected: true,
             showname: "数值"
           },
           {
-            key: "2",
+            key: "TEXT",
             selected: false,
             showname: "文本"
           }
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js
index 699d3f27..0e6d7ab3 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceCustomFieldsModal.js
@@ -7,9 +7,10 @@
 import React, { Component } from "react";
 import { inject, observer } from "mobx-react";
 import { WeaDialog } from "ecCom";
-import { Button } from "antd";
+import { Button, message } from "antd";
 import { conditions } from "../columns";
 import { getSearchs } from "../../../../util";
+import { saveAttendanceField } from "../../../../apis/attendance";
 import "./index.less";
 
 @inject("attendanceStore")
@@ -20,14 +21,49 @@ class AttendanceCustomFieldsModal extends Component {
     form.initFormFields(conditions);
   }
 
+  componentWillReceiveProps(nextProps, nextContext) {
+    if (nextProps.visible !== this.props.visible) this.handleResetForm();
+  }
+
+
+  /*
+   * Author: 黎永顺
+   * Description: 保存考勤字段
+   * Params:
+   * Date: 2023/3/1
+   */
+  handleSubmitFields = () => {
+    const { attendanceStore: { form }, onRefresh, onCancel } = this.props;
+    form.validateForm().then(f => {
+      if (f.isValid) {
+        const payload = form.getFormParams();
+        saveAttendanceField(payload).then(({ status, errormsg }) => {
+          if (status) {
+            message.success("新增成功");
+            onCancel();
+            onRefresh();
+          } else {
+            message.error(errormsg || "新增失败");
+          }
+        });
+      } else {
+        f.showErrors();
+      }
+    });
+  };
+  handleResetForm = () => {
+    const { attendanceStore: { form } } = this.props;
+    form.resetForm();
+  };
+
   render() {
     const { attendanceStore: { form } } = this.props;
     const buttons = [
-      <Button type="primary">保存</Button>
+      <Button type="primary" onClick={this.handleSubmitFields}>保存</Button>
     ];
     return (
       <WeaDialog
-        {...this.props} style={{ width: 440, height: 100 }}
+        {...this.props} style={{ width: 440, height: 202 }}
         buttons={buttons} hasScroll initLoadCss
         className="modalWrapper"
       >
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js
index 79c86f09..487a0775 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js
@@ -111,7 +111,10 @@ class FieldMangComp extends Component {
             pagination={pagination}
             loading={loading.query}
           />
-          <AttendanceCustomFieldsModal {...addPayload} onCancel={this.handleTriggerAttendFileds}/>
+          <AttendanceCustomFieldsModal
+            {...addPayload} onCancel={this.handleTriggerAttendFileds}
+            onRefresh={this.getAttendanceFieldList}
+          />
         </Col>
         <Col xs={24} sm={24} md={8} lg={6}>
           <TipLabel