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 = [
-
+
];
return (
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}
/>
-
+