From acaf6624ef2f706b8ccf442b453d802320829bd3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 四月 2025 16:51:16 +0800
Subject: [PATCH] # 修改 1. 任务列表修改 2. ASN执行状态修改 3. ASN扩展字段优化 4. 确认收货扩展字段优化
---
rsf-admin/src/page/task/TaskList.jsx | 163 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 146 insertions(+), 17 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 4866fb1..9fdda18 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -1,5 +1,7 @@
import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
import { useNavigate } from 'react-router-dom';
+import request from '@/utils/request';
+
import {
List,
DatagridConfigurable,
@@ -15,6 +17,7 @@
useRecordContext,
useTranslate,
useNotify,
+ useRefresh,
useListContext,
FunctionField,
TextField,
@@ -31,6 +34,7 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ Button,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -39,6 +43,10 @@
import EmptyData from "../components/EmptyData";
import MyCreateButton from "../components/MyCreateButton";
import MyExportButton from '../components/MyExportButton';
+import SwapVertIcon from '@mui/icons-material/SwapVert';
+import AlignVerticalTopIcon from '@mui/icons-material/AlignVerticalTop';
+import TaskAltIcon from '@mui/icons-material/TaskAlt';
+import CancelIcon from '@mui/icons-material/Cancel';
import PageDrawer from "../components/PageDrawer";
import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
@@ -62,7 +70,6 @@
<SearchInput source="condition" alwaysOn />,
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
<TextInput source="taskCode" label="table.field.task.taskCode" />,
<NumberInput source="taskStatus" label="table.field.task.taskStatus" />,
<NumberInput source="taskType" label="table.field.task.taskType" />,
@@ -78,7 +85,6 @@
<TextInput source="expCode" label="table.field.task.expCode" />,
<DateInput source="startTime" label="table.field.task.startTime" />,
<DateInput source="endTime" label="table.field.task.endTime" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -93,7 +99,6 @@
const TaskList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
@@ -109,26 +114,33 @@
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.task"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={false}
filters={filters}
- sort={{ field: "create_time", order: "desc" }}
+ sort={{ field: "sort", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='task' />
- <MyExportButton />
+ {/* <MyExportButton /> */}
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
>
<StyledDatagrid
preferenceKey='task'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ // bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={
+ <>
+ <BulkResortButton />
+ <BulkCancelButton />
+ <BulkDeleteButton mutationMode={OPERATE_MODE} />
+ </>
+ }
rowClick={(id, resource, record) => false}
- expand={() => <TaskPanel />}
- expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ // expand={() => <TaskPanel />}
+ // expandSingle={true}
+ omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'sort']}
>
<NumberField source="id" />
<TextField source="taskCode" label="table.field.task.taskCode" />
@@ -155,15 +167,13 @@
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ {/* <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} /> */}
+ <DoneButton sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton>
+ <CancelButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ <SetTopButton sx={{ padding: '1px', fontSize: '.75rem' }} ></SetTopButton>
</WrapperField>
</StyledDatagrid>
</List>
- <TaskCreate
- open={createDialog}
- setOpen={setCreateDialog}
- />
<PageDrawer
title='Task Detail'
drawerVal={drawerVal}
@@ -175,3 +185,122 @@
}
export default TaskList;
+/**
+ * 瀹屾垚鎿嶄綔
+ * @returns
+ */
+const DoneButton = () => {
+ const record = useRecordContext();
+ const clickComplete = () => {
+ completeTask([record])
+ };
+ //瀹屾垚浠诲姟
+ const completeTask = async (row) => { }
+ return (
+ <Button
+ onClick={clickComplete}
+ label="toolbar.complete">
+ <TaskAltIcon />
+ </Button>
+ )
+}
+
+/**
+ * 鍙栨秷鎸夐挳
+ * @returns
+ */
+const CancelButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const clickCancel = () => {
+ cancleTask(record)
+ };
+ //鍙栨秷浠诲姟
+ const cancleTask = async (row) => {
+ console.log(row);
+ const { data: { code, data, msg } } = await request.post(`/task/remove/` + row.id);
+ if (code === 200) {
+ notify(msg);
+ refresh();
+ } else {
+ notify(msg);
+ }
+ }
+ return (
+ <Button
+ onClick={clickCancel}
+ label="toolbar.cancel">
+ <CancelIcon />
+ </Button>
+ )
+}
+/**
+ * 缃《鎿嶄綔
+ * @returns
+ */
+const SetTopButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const clickTop = () => {
+ topTask(record)
+ };
+ //缃《浠诲姟
+ const topTask = async (row) => {
+ const { data: { code, data, msg } } = await request.post(`/task/top/` + row.id);
+ if (code === 200) {
+ notify(msg);
+ refresh();
+ } else {
+ notify(msg);
+ }
+ }
+ return (
+ <Button
+ onClick={clickTop}
+ label="toolbar.top">
+ <AlignVerticalTopIcon />
+ </Button>
+ )
+}
+
+/**
+ * 鎵归噺鍙栨秷
+ * @returns
+ */
+const BulkCancelButton = () => {
+ const record = useRecordContext();
+ const clickCancel = () => {
+ cancleTask([record])
+ };
+ //鍙栨秷浠诲姟
+ const cancleTask = async (row) => { }
+ return (
+ <Button
+ onClick={clickCancel}
+ label="toolbar.cancel">
+ <CancelIcon />
+ </Button>
+ )
+}
+
+/**
+ * 鎵归噺鎺掑簭
+ * @returns
+ */
+const BulkResortButton = () => {
+ const record = useRecordContext();
+ const bulkResort = () => {
+ resortTask([record])
+ };
+ //鎵归噺鎺掑簭
+ const resortTask = async (row) => { }
+ return (
+ <Button
+ onClick={bulkResort}
+ label="toolbar.resort">
+ <SwapVertIcon />
+ </Button>
+ )
+}
\ No newline at end of file
--
Gitblit v1.9.1