From 284cec8871453c0b7ee978d2a8e6e2cdd378e9d9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 16:06:49 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/locPreview/LocPreviewEdit.jsx | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
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 />
</>
)
}
--
Gitblit v1.9.1