diff --git a/src/pages/Admin/DutyInfo/index.tsx b/src/pages/Admin/DutyInfo/index.tsx
index c4960d3..7cce464 100644
--- a/src/pages/Admin/DutyInfo/index.tsx
+++ b/src/pages/Admin/DutyInfo/index.tsx
@@ -1,4 +1,4 @@
-import { getDutyInfo, updateDutyInfo } from '@/services/api';
+import { getDutyInfo } from '@/services/api';
import {
EditableProTable,
PageContainer,
@@ -12,6 +12,7 @@ import {
} from '@ant-design/pro-components';
import { Card, message } from 'antd';
import { useEffect, useState } from 'react';
+import request from 'umi-request';
import { Info } from './info';
type Shift = {
@@ -81,20 +82,34 @@ const DutyInfo: React.FC = () => {
{contextHolder}
{!loading && (
-
- submitter={{
- resetButtonProps: { style: { display: 'none' } },
- submitButtonProps: {
- style: { width: '31%' },
- },
- render: (_, doms) => {
- return {doms}
;
- },
- }}
- onFinish={updateDutyInfo}
- initialValues={dutyInfo}
- >
-
+
+ submitter={{
+ resetButtonProps: { style: { display: 'none' } },
+ submitButtonProps: {
+ style: { width: '31%' },
+ },
+ render: (_, doms) => {
+ return {doms}
;
+ },
+ }}
+ onFinish={async (values) => {
+ setLoading(true);
+ request('/admin/duty/update', {
+ method: 'POST',
+ data: values,
+ })
+ .then(() => {
+ setLoading(false);
+ message.success('提交成功');
+ })
+ .catch((err) => {
+ setLoading(false);
+ message.error('提交失败:' + err);
+ });
+ }}
+ initialValues={dutyInfo}
+ >
+
-
+
+
{({ dutyStatus }) => {
if (dutyStatus === 'pause') {
@@ -125,11 +140,13 @@ const DutyInfo: React.FC = () => {
name="offDutyReason"
label="值班暂停原因"
placeholder="请输入暂停值班的原因"
+ rules={[{ required: true }]}
/>
);
@@ -142,55 +159,57 @@ const DutyInfo: React.FC = () => {
width="md"
min={0}
max={10}
+ rules={[{ required: true }]}
/>
);
}}
-
-
- {({ dutyStatus }) => {
- if (dutyStatus === 'others') {
- return (
-
-
-
- rowKey="id"
- toolBarRender={false}
- columns={columns}
- recordCreatorProps={{
- newRecordType: 'dataSource',
- position: 'bottom',
- creatorButtonText: '新建一个值班班次',
- style: { width: '100%', margin: 'auto', marginTop: '2%' },
- record: () => ({
- id: Date.now(),
- title: '',
- place: '',
- range: [],
- }),
- }}
- editable={{
- type: 'multiple',
- editableKeys,
- onChange: setEditableRowKeys,
- actionRender: (row, _, dom) => {
- return [dom.delete];
- },
- }}
- />
-
-
- );
- }
- }}
-
-
+
+
+ {({ dutyStatus }) => {
+ if (dutyStatus === 'others') {
+ return (
+
+
+
+ rowKey="id"
+ toolBarRender={false}
+ columns={columns}
+ recordCreatorProps={{
+ newRecordType: 'dataSource',
+ position: 'bottom',
+ creatorButtonText: '新建一个值班班次',
+ style: { width: '100%', margin: 'auto', marginTop: '2%' },
+ record: () => ({
+ id: Date.now(),
+ title: '',
+ place: '',
+ range: [],
+ }),
+ }}
+ editable={{
+ type: 'multiple',
+ editableKeys,
+ onChange: setEditableRowKeys,
+ actionRender: (row, _, dom) => {
+ return [dom.delete];
+ },
+ }}
+ />
+
+
+ );
+ }
+ }}
+
+
)}
diff --git a/src/services/api.ts b/src/services/api.ts
index 6d9138c..6a71d30 100644
--- a/src/services/api.ts
+++ b/src/services/api.ts
@@ -1,6 +1,6 @@
// @ts-ignore
/* eslint-disable */
-import { Info, ServerInfo } from '@/pages/Admin/DutyInfo/info';
+import { ServerInfo } from '@/pages/Admin/DutyInfo/info';
import { Stat } from '@/pages/Welcome/stat';
import { request } from '@umijs/max';
import { API } from './typings';
@@ -54,12 +54,3 @@ export async function getDutyInfo(options?: { [key: string]: any }) {
...(options || {}),
});
}
-
-/** 上传当前值班信息 POST /admin/duty/update */
-export async function updateDutyInfo(body: Info, options?: { [key: string]: any }) {
- return request('/admin/duty/update', {
- method: 'POST',
- data: body,
- ...(options || {}),
- });
-}