Merge remote-tracking branch 'origin/devlop' into devlop

zjj

2025-04-28 b69b63a09089566b0b2505fbc39a673c3e18785f

 rsf-admin/src/page/task/TaskList.jsx

@@ -8,36 +8,24 @@
    SearchInput,
    TopToolbar,
    SelectColumnsButton,
    EditButton,
    FilterButton,
    CreateButton,
    ExportButton,
    BulkDeleteButton,
    WrapperField,
    useRecordContext,
    useTranslate,
    useNotify,
    useRefresh,
    useDataProvider,
    useListContext,
    FunctionField,
    TextField,
    NumberField,
    DateField,
    BooleanField,
    ReferenceField,
    TextInput,
    DateTimeInput,
    DateInput,
    SelectInput,
    NumberInput,
    ReferenceInput,
    ReferenceArrayInput,
    AutocompleteInput,
    DeleteButton,
    Button,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { Box, Typography, Card, Stack, Drawer } from '@mui/material';
import { styled } from '@mui/material/styles';
import TaskCreate from "./TaskCreate";
import TaskPanel from "./TaskPanel";
@@ -63,7 +51,7 @@
    '& .column-name': {
    },
    '& .opt': {
        width: 200
        width: 248
    },
}));

@@ -98,11 +86,9 @@
    />,
]

const TaskList = () => {
const TaskList = (props) => {
    const translate = useTranslate();
    const [createDialog, setCreateDialog] = useState(false);
    const [drawerVal, setDrawerVal] = useState(false);
    const [data, setData] = useState([]);    
    return (
        <Box display="flex">
            <List
@@ -135,10 +121,10 @@
                            <BulkDeleteButton mutationMode={OPERATE_MODE} />
                        </>
                    }
                    rowClick={false}
                    expand={() => <TaskPanel/>}
                    rowClick={'edit'}
                    expand={false}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'sort']}
                    omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status', 'sort']}
                >
                    <NumberField source="id" />
                    <TextField source="taskCode" label="table.field.task.taskCode" />
@@ -154,11 +140,11 @@
                    <TextField source="expDesc" label="table.field.task.expDesc" />
                    <NumberField source="sort" label="table.field.task.sort" />
                    <TextField source="expCode" label="table.field.task.expCode" />
                    <TextField source="updateBy$" label="common.field.updateBy"/>
                    <TextField source="createBy$" label="common.field.createBy"/>
                    <TextField source="updateBy$" label="common.field.updateBy" />
                    <TextField source="createBy$" label="common.field.createBy" />
                    <DateField source="updateTime" label="common.field.updateTime" showTime />
                    <DateField source="createTime" label="common.field.createTime" showTime />
                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                    {/* <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">
                        <DoneButton sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton>
@@ -178,17 +164,31 @@
}

export default TaskList;


/**
 * 完成操作
 * @returns 
 */
const DoneButton = () => {
const DoneButton = (props) => {
    const record = useRecordContext();
    const clickComplete = () => {
        completeTask([record])
    const notify = useNotify(); 
    const refresh = useRefresh();
    const clickComplete = (event) => {
        event.stopPropagation();
        completeTask(record)
    };
    //完成任务
    const completeTask = async (row) => { }
    const completeTask = async (row) => {
        console.log(row.id);
        const { data: { code, data, msg } } = await request.post(`task/complete/` + row.id);
        if (code === 200) {
            notify(msg);
            refresh();
        } else {
            notify(msg);
        }
    }
    return (
        <Button
            onClick={clickComplete}
@@ -210,7 +210,7 @@
        cancleTask(record)
    };
    //取消任务
    const cancleTask = async (row) => {
    const cancleTask = async (row) => { 
        console.log(row);
        const { data: { code, data, msg } } = await request.post(`/task/remove/` + row.id);
        if (code === 200) {
@@ -248,7 +248,7 @@
        } else {
            notify(msg);
        }
     }
    }
    return (
        <Button
            onClick={clickTop}