From 78120f498fb7e34c504b139fd4e8e4c318c336c3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 02 八月 2025 09:55:17 +0800
Subject: [PATCH] 库位明细详情报错修改
---
rsf-admin/src/page/locPreview/LocPreviewItems.jsx | 5 +-
rsf-admin/src/page/basicInfo/loc/LocEdit.jsx | 5 --
rsf-admin/src/page/locPreview/LocPreviewEdit.jsx | 34 ++++++++++++++--
rsf-admin/src/page/locPreview/LocPreviewList.jsx | 4 +-
rsf-admin/src/page/basicInfo/loc/LocList.jsx | 44 ++++++++++-----------
5 files changed, 55 insertions(+), 37 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx b/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
index 482e84a..cddeaff 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
@@ -36,7 +36,6 @@
import * as Common from '@/utils/common';
import LocItemList from "./LocItemList";
import request from '@/utils/request';
-import { da } from "date-fns/locale";
const FormToolbar = () => {
const { getValues } = useFormContext();
@@ -181,7 +180,3 @@
export default LocEdit;
-
-const ArraySelectInput = () => {
-
-}
diff --git a/rsf-admin/src/page/basicInfo/loc/LocList.jsx b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
index ea3a339..732f9a8 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocList.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
@@ -35,26 +35,26 @@
Button,
useList,
} from 'react-admin';
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import { Box, Typography, Card, Stack } from '@mui/material';
-import { styled } from '@mui/material/styles';
-import LocCreate from "./LocCreate";
-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 DashboardIcon from '@mui/icons-material/Dashboard';
+import DynamicField from "../../components/DynamicField";
+import DiscountIcon from '@mui/icons-material/Discount';
+import PageDrawer from "../../components/PageDrawer";
+import EmptyData from "../../components/EmptyData";
+import EditIcon from '@mui/icons-material/Edit';
+import LinkIcon from '@mui/icons-material/Link';
+import { styled } from '@mui/material/styles';
+import SubzoneModal from './SubzoneModal';
+import LocListAside from "./LocListAside";
import InitButton from './InitButton';
import BatchModal from './BatchModal';
-import SubzoneModal from './SubzoneModal';
-import PageDrawer from "../../components/PageDrawer";
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-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 LocCreate from "./LocCreate";
+import BindModal from "./BindModal";
import InitModal from "./InitModal";
-import LocListAside from "./LocListAside";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -83,16 +83,14 @@
},
}));
-
-
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);
const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_loc_use_stas')) || [];
+ const [createDialog, setCreateDialog] = useState(false);
+ const [initDialog, setInitDialog] = useState(false);
+ const [drawerVal, setDrawerVal] = useState(false);
+ const translate = useTranslate();
+ const refresh = useRefresh();
+ const notify = useNotify();
const filters = [
<SearchInput source="condition" alwaysOn />,
@@ -223,12 +221,12 @@
</>
}
rowClick={() => false}
- omit={['id', 'createTime', 'createBy', 'memo', 'updateTime', 'updateBy', 'length', 'width', 'height','statusBool','updateBy$','createBy$']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'updateTime', 'updateBy', 'length', 'width', 'height', 'statusBool', 'updateBy$', 'createBy$']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.loc.code" />
<NumberField source="warehouseId$" label="table.field.loc.warehouseId" />
- <NumberField source="areaId$" label="table.field.loc.areaId" />
+ <NumberField source="areaId$" label="table.field.loc.areaId" />
<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" />
diff --git a/rsf-admin/src/page/locPreview/LocPreviewEdit.jsx b/rsf-admin/src/page/locPreview/LocPreviewEdit.jsx
index 88b9678..5033a64 100644
--- a/rsf-admin/src/page/locPreview/LocPreviewEdit.jsx
+++ b/rsf-admin/src/page/locPreview/LocPreviewEdit.jsx
@@ -30,7 +30,7 @@
import { useWatch, useFormContext } from "react-hook-form";
import EditBaseAside from "../components/EditBaseAside";
import MemoInput from "../components/MemoInput";
-import LocQueryList from "./LocQueryList";
+import LocPreviewItems from "./LocPreviewItems";
import * as Common from '@/utils/common';
import request from '@/utils/request';
@@ -57,6 +57,19 @@
warnWhenUnsavedChanges
toolbar={false}
mode="onTouched"
+ sx={{
+ "& .MuiFormLabel-root.MuiInputLabel-root.Mui-disabled": {
+ bgcolor: 'white',
+ WebkitTextFillColor: "rgba(0, 0, 0)"
+ },
+ "& .MuiInputBase-input.MuiFilledInput-input.Mui-disabled": {
+ bgcolor: 'white',
+ WebkitTextFillColor: "rgba(0, 0, 0)"
+ },
+ "& .MuiFilledInput-root.MuiInputBase-sizeSmall": {
+ bgcolor: 'white',
+ }
+ }}
// validate={(values) => { }}
>
<Grid container width={{ xs: '100%', xl: '90%' }} rowSpacing={3} columnSpacing={3}>
@@ -76,6 +89,7 @@
validate={[required()]}
onChange={warehouseChange}
filterToQuery={(val) => ({ name: val })}
+ readOnly
/>
</ReferenceInput>
<ReferenceInput
@@ -88,6 +102,7 @@
optionText="name"
validate={[required()]}
filterToQuery={(val) => ({ name: val })}
+ readOnly
/>
</ReferenceInput>
<TextInput
@@ -95,30 +110,35 @@
source="code"
parse={v => v}
validate={required()}
+ readOnly
/>
<NumberInput
label="table.field.loc.length"
source="length"
+ readOnly
/>
<NumberInput
label="table.field.loc.width"
source="width"
+ readOnly
/>
<NumberInput
label="table.field.loc.height"
source="height"
+ readOnly
/>
</Grid>
<Grid item display="flex" gap={1}>
- {/* <ReferenceArrayInput source="typeIds" reference="locType" >
- <SelectArrayInput label="table.field.loc.type" />
- </ReferenceArrayInput> */}
+ <ReferenceArrayInput source="typeIds" reference="locType" >
+ <SelectArrayInput label="table.field.loc.type" readOnly/>
+ </ReferenceArrayInput>
<TextInput
label="table.field.loc.unit"
source="unit"
parse={v => v}
+ readOnly
/>
<DictionarySelect
label={translate("table.field.loc.useStatus")}
@@ -126,22 +146,26 @@
validate={[required()]}
size="small"
dictTypeCode="sys_loc_use_stas"
+ readOnly
/>
<NumberInput
label="table.field.loc.row"
source="row"
validate={required()}
+ readOnly
/>
<NumberInput
label="table.field.loc.col"
source="col"
validate={required()}
+ readOnly
/>
<NumberInput
label="table.field.loc.lev"
source="lev"
validate={required()}
+ readOnly
/>
</Grid>
</Grid>
@@ -149,7 +173,7 @@
</Grid>
</SimpleForm>
</Edit >
- {/* <LocQueryList /> */}
+ <LocPreviewItems />
</>
)
}
diff --git a/rsf-admin/src/page/locPreview/LocQueryList.jsx b/rsf-admin/src/page/locPreview/LocPreviewItems.jsx
similarity index 98%
rename from rsf-admin/src/page/locPreview/LocQueryList.jsx
rename to rsf-admin/src/page/locPreview/LocPreviewItems.jsx
index 1ae7cae..0776a7b 100644
--- a/rsf-admin/src/page/locPreview/LocQueryList.jsx
+++ b/rsf-admin/src/page/locPreview/LocPreviewItems.jsx
@@ -94,7 +94,7 @@
/>,
]
-const LocItemList = () => {
+const LocPreviewItems = () => {
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const translate = useTranslate();
@@ -114,6 +114,7 @@
}}
title={"menu.locPreview"}
empty={false}
+ resource="locItem"
filter={{ locId: locId }}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
@@ -137,7 +138,7 @@
)
}
-export default LocItemList;
+export default LocPreviewItems;
const DynamicFields = (props) => {
diff --git a/rsf-admin/src/page/locPreview/LocPreviewList.jsx b/rsf-admin/src/page/locPreview/LocPreviewList.jsx
index 5c20428..a30d41a 100644
--- a/rsf-admin/src/page/locPreview/LocPreviewList.jsx
+++ b/rsf-admin/src/page/locPreview/LocPreviewList.jsx
@@ -109,7 +109,7 @@
source="useStatus"
optionValue="value"
parse={v => v}
-
+ alwaysOn
/>,
<TextInput source="code" label="table.field.loc.code" />,
<AutocompleteInput
@@ -123,7 +123,7 @@
<TextInput source="name" label="table.field.loc.name" />,
<NumberInput source="flagLogic" label="table.field.loc.flagLogic" />,
<TextInput source="fucAtrrs" label="table.field.loc.fucAtrrs" />,
- <TextInput source="barcode" label="table.field.loc.barcode" />,
+ <TextInput source="barcode" label="table.field.loc.barcode" alwaysOn/>,
<TextInput source="unit" label="table.field.loc.unit" />,
<TextInput source="size" label="table.field.loc.size" />,
<NumberInput source="row" label="table.field.loc.row" />,
--
Gitblit v1.9.1