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

zjj

7 天以前 8233002dffa7ae961c6115ba8e47138d3ddefb3e

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

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

@@ -29,16 +29,12 @@
} from 'react-admin';
import { Box, Typography, Card, Stack, Drawer } from '@mui/material';
import { styled } from '@mui/material/styles';
import TaskCreate from "./TaskCreate";
import TaskPanel from "./TaskPanel";
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 TaskPanel from "./TaskPanel";
import MyField from "../components/MyField";
import ConfirmButton from "../components/ConfirmButton";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
@@ -135,15 +131,15 @@
            >
                <StyledDatagrid
                    preferenceKey='task'
                    bulkActionButtons={
                        <>
                            <BulkResortButton />
                            <BulkCancelButton />
                            <BulkDeleteButton mutationMode={OPERATE_MODE} />
                        </>
                    bulkActionButtons={false
                        // <>
                        //     <BulkResortButton />
                        //     <BulkCancelButton />
                        //     <BulkDeleteButton mutationMode={OPERATE_MODE} />
                        // </>
                    }
                    rowClick={false}
                    expand={false}
                    expand={<TaskPanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status']}
                >
@@ -317,7 +313,7 @@
            refresh();
        } else {
            notify(msg);
        }
        } 
    }
    return (
        (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 103 || record.taskType == 11) ?