From bed735aae42b6e0c75bf3fd63d9cd0996fba9355 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 21 五月 2025 14:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/basicInfo/loc/LocList.jsx | 287 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 223 insertions(+), 64 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/loc/LocList.jsx b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
index b9b2578..ef686d0 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocList.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
@@ -32,24 +32,29 @@
AutocompleteInput,
DeleteButton,
useRefresh,
- Button
+ Button,
+ useList,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
import LocCreate from "./LocCreate";
-import LocPanel from "./LocPanel";
+import BindModal from "./BindModal";
import EmptyData from "../../components/EmptyData";
+import DynamicField from "../../components/DynamicField";
import MyCreateButton from "../../components/MyCreateButton";
import MyExportButton from '../../components/MyExportButton';
import InitButton from './InitButton';
import BatchModal from './BatchModal';
+import SubzoneModal from './SubzoneModal';
import PageDrawer from "../../components/PageDrawer";
-import MyField from "../../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import * as Common from '@/utils/common';
import DashboardIcon from '@mui/icons-material/Dashboard';
import EditIcon from '@mui/icons-material/Edit';
import request from '@/utils/request';
+import DiscountIcon from '@mui/icons-material/Discount';
+import LinkIcon from '@mui/icons-material/Link';
+import InitModal from "./InitModal";
+import LocListAside from "./LocListAside";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -61,15 +66,47 @@
'& .column-name': {
},
'& .opt': {
- width: 200
+ width: 180
+ },
+ // '& .RaDatagrid-headerCell': {
+ // textAlign: 'left'
+ // },
+ // '& .RaDatagrid-rowCell': {
+ // textAlign: 'left'
+ // },
+ '& .type .MuiTypography-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'hidden',
+ textOverflow: 'ellipsis',
+ display: 'block',
+ width: 'auto',
},
}));
const filters = [
<SearchInput source="condition" alwaysOn />,
-
- <NumberField source="warehouseId$" label="table.field.loc.warehouseId" />,
- <NumberField source="areaId$" label="table.field.loc.areaId" />,
+ <ReferenceInput
+ source="warehouseId"
+ label="table.field.loc.warehouseId"
+ reference="warehouse"
+ >
+ <AutocompleteInput
+ label="table.field.loc.warehouseId"
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>,
+ <ReferenceInput
+ source="areaId"
+ label="table.field.loc.areaId"
+ reference="warehouseAreas"
+ >
+ <AutocompleteInput
+ label="table.field.loc.areaId"
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>,
<TextInput source="code" label="table.field.loc.code" />,
<TextInput source="type" label="table.field.loc.type" />,
<TextInput source="name" label="table.field.loc.name" />,
@@ -101,10 +138,11 @@
const LocList = () => {
const translate = useTranslate();
-
+ const notify = useNotify();
+ const refresh = useRefresh();
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
-
+ const [initDialog, setInitDialog] = useState(false);
return (
<Box display="flex">
@@ -118,7 +156,32 @@
marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.loc"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={<EmptyData
+ children={
+ <Box sx={{ gap: 2, display: 'flex' }}>
+ <Button
+ variant="contained"
+ color="primary"
+ sx={{
+ fontSize: '1em',
+ mt: 2
+ }}
+ onClick={() => { setCreateDialog(true) }}>
+ {translate('create.empty.button')}
+ </Button>
+ <Button
+ variant="contained"
+ color="primary"
+ sx={{
+ fontSize: '1em',
+ mt: 2
+ }}
+ onClick={() => { setInitDialog(true) }}>
+ {translate('toolbar.locInit')}
+ </Button>
+ </Box>
+ }
+ onClick={() => { }} />}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
@@ -131,56 +194,64 @@
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
+ aside={<LocListAside />}
>
<StyledDatagrid
preferenceKey='loc'
+ align="left"
bulkActionButtons={
<>
- <BatchButton />
+ <BatchWateButton />
+ <BatchAreasButton />
+ <BatchLocTypeButton />
+ <BatchStatusButton />
+ <BindButton />
+ <SubzoneButton />
<BulkDeleteButton />
</>
}
rowClick={() => false}
- expand={() => <LocPanel />}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'updateTime', 'updateBy']}
>
<NumberField source="id" />
<NumberField source="warehouseId$" label="table.field.loc.warehouseId" />
<NumberField source="areaId$" label="table.field.loc.areaId" />
<TextField source="code" label="table.field.loc.code" />
- <TextField source="type" label="table.field.loc.type" />
- <TextField source="name" label="table.field.loc.name" />
- <NumberField source="flagLogic" label="table.field.loc.flagLogic" />
+ <TextField source="typeIds$" label="table.field.loc.type" cellClassName="type" />
+ {/* <TextField source="name" label="table.field.loc.name" /> */}
+ {/* <NumberField source="flagLogic" label="table.field.loc.flagLogic" />
<TextField source="fucAtrrs" label="table.field.loc.fucAtrrs" />
- <TextField source="barcode" label="table.field.loc.barcode" />
- <TextField source="unit" label="table.field.loc.unit" />
- <TextField source="size" label="table.field.loc.length" />
- <TextField source="size" label="table.field.loc.width" />
- <TextField source="size" label="table.field.loc.height" />
- <NumberField source="lrow" label="table.field.loc.row" />
+ <TextField source="barcode" label="table.field.loc.barcode" /> */}
+ {/* <TextField source="unit" label="table.field.loc.unit" /> */}
+ <TextField source="length" label="table.field.loc.length" />
+ <TextField source="width" label="table.field.loc.width" />
+ <TextField source="height" label="table.field.loc.height" />
+ <NumberField source="row" label="table.field.loc.row" />
<NumberField source="col" label="table.field.loc.col" />
<NumberField source="lev" label="table.field.loc.lev" />
- <NumberField source="channel" label="table.field.loc.channel" />
+ {/* <NumberField source="channel" label="table.field.loc.channel" />
<NumberField source="maxParts" label="table.field.loc.maxParts" />
<NumberField source="maxPack" label="table.field.loc.maxPack" />
<NumberField source="flagLabelMange" label="table.field.loc.flagLabelMange" />
- <TextField source="locAttrs" label="table.field.loc.locAttrs" />
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
- <DateField source="updateTime" label="common.field.updateTime" showTime />
- <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
- <DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ <TextField source="locAttrs" label="table.field.loc.locAttrs" /> */}
+ <TextField source="useStatus$" label="table.field.loc.useStatus" />
+ <TextField source="updateBy$" label="common.field.updateBy" />
+ <DateField source="updateTime" label="common.field.updateTime" showTime align="left" />
+ <TextField source="createBy$" label="common.field.createBy" />
+ <DateField source="createTime" label="common.field.createTime" showTime align="left" />
+ <BooleanField source="statusBool" label="common.field.status" sortable={false} align="left" />
<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} /> */}
<EnableButton />
</WrapperField>
+
</StyledDatagrid>
+ <InitModal
+ open={initDialog}
+ setOpen={setInitDialog}
+ />
</List>
<LocCreate
open={createDialog}
@@ -192,6 +263,8 @@
setDrawerVal={setDrawerVal}
>
</PageDrawer>
+
+
</Box>
)
}
@@ -224,22 +297,116 @@
)
}
-const BatchButton = () => {
+const BatchWateButton = () => {
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
- const { selectedIds } = useListContext();
- console.log(selectedIds)
const [createDialog, setCreateDialog] = useState(false);
return (
<>
- <Button onClick={() => setCreateDialog(true)} label={"toolbar.batch"}>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchWarehouse"}>
<EditIcon />
</Button>
<BatchModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ fieldType={'warehouseId'}
+ />
+ </>
+
+ )
+}
+
+const BatchAreasButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+
+ const [createDialog, setCreateDialog] = useState(false);
+
+ return (
+ <>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchWarehouseAreas"}>
+ <EditIcon />
+ </Button>
+
+ <BatchModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ fieldType={'areaId'}
+ />
+ </>
+
+ )
+}
+
+const BatchLocTypeButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+
+ const [createDialog, setCreateDialog] = useState(false);
+
+ return (
+ <>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchLocType"}>
+ <EditIcon />
+ </Button>
+
+ <BatchModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ fieldType={'typeIds'}
+ />
+ </>
+
+ )
+}
+
+const BatchStatusButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+
+ const [createDialog, setCreateDialog] = useState(false);
+
+ return (
+ <>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.batchStatus"}>
+ <EditIcon />
+ </Button>
+
+ <BatchModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ fieldType={'status'}
+ />
+ </>
+
+ )
+}
+
+const SubzoneButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+
+ const [createDialog, setCreateDialog] = useState(false);
+
+ return (
+ <>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.subzone"}>
+ <DiscountIcon />
+ </Button>
+
+ <SubzoneModal
open={createDialog}
setOpen={setCreateDialog}
/>
@@ -247,34 +414,26 @@
)
}
-const CustomBulkActionButton = () => {
- const { selectedIds } = useListContext();
+
+const BindButton = () => {
+ const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
- const handleCustomBulkAction = async () => {
- if (selectedIds.length === 0) {
- notify('璇烽�夋嫨瑕佹搷浣滅殑璁板綍');
- return;
- }
- // 杩欓噷鍐欏叿浣撶殑鎵归噺鎿嶄綔閫昏緫锛屼緥濡傚悜鏈嶅姟鍣ㄥ彂閫佽姹�
- try {
- const res = await request.post('/loc/bulk-action', { ids: selectedIds });
- if (res?.data?.code === 200) {
- refresh();
- notify('鎵归噺鎿嶄綔鎴愬姛');
- } else {
- notify(res.data.msg);
- }
- } catch (error) {
- notify('鎵归噺鎿嶄綔澶辫触锛岃绋嶅悗閲嶈瘯');
- }
- };
+
+ const [createDialog, setCreateDialog] = useState(false);
return (
- <Button onClick={handleCustomBulkAction} label="鑷畾涔夋壒閲忔搷浣�">
- {/* 鍙互娣诲姞鑷畾涔夊浘鏍� */}
- <EditIcon />
- </Button>
- );
-};
\ No newline at end of file
+ <>
+ <Button onClick={() => setCreateDialog(true)} label={"toolbar.bindmatnr"}>
+ <LinkIcon />
+ </Button>
+
+ <BindModal
+ open={createDialog}
+ setOpen={setCreateDialog}
+ />
+ </>
+
+ )
+}
\ No newline at end of file
--
Gitblit v1.9.1