From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx b/rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx
index 91fcd56..b6f182e 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinEdit.jsx
@@ -17,8 +17,7 @@
import CustomerTopToolBar from "../components/EditTopToolBar";
import MemoInput from "../components/MemoInput";
import StatusSelectInput from "../components/StatusSelectInput";
-import WaitPakinItem from "../waitPakinItem";
-import WaitPakinItemList from "../waitPakinItem/WaitPakinItemList";
+import WaitPakinItemList from "./WaitPakinItemList";
const FormToolbar = () => {
const { getValues } = useFormContext();
@@ -43,14 +42,24 @@
aside={<EditBaseAside />}
>
<SimpleForm
+ sx={{
+ '& .MuiInputBase-input.MuiFilledInput-input.Mui-disabled': {
+ bgcolor: "white",
+ color: "black",
+ '-webkit-text-fill-color': "rgba(0, 0, 0)"
+ },
+ '& .MuiFormLabel-root.MuiInputLabel-root.Mui-disabled': {
+ color: 'rgba(0, 0, 0, 0.77)'
+ }
+ }}
shouldUnregister
warnWhenUnsavedChanges
- toolbar={<FormToolbar />}
+ toolbar={<></>}
mode="onTouched"
defaultValues={{}}
>
<Grid container width={{ xs: '100%', xl: '100%' }}>
- <Grid item xs={12} md={8}>
+ <Grid item xs={24} md={12}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.main')}
</Typography>
@@ -62,25 +71,16 @@
parse={v => v}
autoFocus
/>
- <NumberInput
- label="table.field.waitPakin.ansId"
- readOnly
- source="ansId"
- />
- <TextInput
- label="table.field.waitPakin.asnCode"
- readOnly
- source="asnCode"
- parse={v => v}
- />
<SelectInput
label="table.field.waitPakin.flagDefect"
readOnly
source="flagDefect"
- parse={v => v}
+ choices={[
+ { id: 0, name: '鍚�' },
+ { id: 1, name: ' 鏄�' },
+ ]}
/>
- </Stack>
- <Stack direction='row' gap={2}>
+
<TextInput
label="table.field.waitPakin.barcode"
readOnly
--
Gitblit v1.9.1