From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 十一月 2024 10:22:45 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/page/loc/LocEdit.jsx |  114 +++++++++++++++++++++++++++------------------------------
 1 files changed, 54 insertions(+), 60 deletions(-)

diff --git a/zy-acs-flow/src/page/loc/LocEdit.jsx b/zy-acs-flow/src/page/loc/LocEdit.jsx
index 744c494..3867ad0 100644
--- a/zy-acs-flow/src/page/loc/LocEdit.jsx
+++ b/zy-acs-flow/src/page/loc/LocEdit.jsx
@@ -47,7 +47,7 @@
         <Edit
             redirect="list"
             mutationMode={EDIT_MODE}
-            actions={<CustomerTopToolBar />}
+            actions={<CustomerTopToolBar backPrevious />}
             aside={<EditBaseAside />}
         >
             <SimpleForm
@@ -63,14 +63,14 @@
                         <Typography variant="h6" gutterBottom>
                             {translate('common.edit.title.main')}
                         </Typography>
-                        <Stack direction='row' gap={2}>
+                        {/* <Stack direction='row' gap={2}>
                             <TextInput
                                 label="table.field.loc.uuid"
                                 source="uuid"
                                 parse={v => v}
                                 autoFocus
                             />
-                        </Stack>
+                        </Stack> */}
                         <Stack direction='row' gap={2}>
                             <ReferenceInput
                                 source="zoneId"
@@ -81,23 +81,43 @@
                                     label="table.field.loc.zoneId"
                                     optionText="name"
                                     filterToQuery={(val) => ({ name: val })}
+                                    validate={required()}
                                 />
                             </ReferenceInput>
-                        </Stack>
-                        <Stack direction='row' gap={2}>
                             <TextInput
                                 label="table.field.loc.locNo"
                                 source="locNo"
                                 parse={v => v}
+                                validate={required()}
                             />
                         </Stack>
                         <Stack direction='row' gap={2}>
+                            <Stack direction='row' gap={2}>
+                                <NumberInput
+                                    label="table.field.loc.row"
+                                    source="row"
+                                />
+                            </Stack>
+                            <Stack direction='row' gap={2}>
+                                <NumberInput
+                                    label="table.field.loc.bay"
+                                    source="bay"
+                                />
+                            </Stack>
+                            <Stack direction='row' gap={2}>
+                                <NumberInput
+                                    label="table.field.loc.lev"
+                                    source="lev"
+                                />
+                            </Stack>
+                        </Stack>
+                        {/* <Stack direction='row' gap={2}>
                             <TextInput
                                 label="table.field.loc.name"
                                 source="name"
                                 parse={v => v}
                             />
-                        </Stack>
+                        </Stack> */}
                         <Stack direction='row' gap={2}>
                             <ReferenceInput
                                 source="code"
@@ -110,8 +130,6 @@
                                     filterToQuery={(val) => ({ data: val })}
                                 />
                             </ReferenceInput>
-                        </Stack>
-                        <Stack direction='row' gap={2}>
                             <SelectInput
                                 label="table.field.loc.compDirect"
                                 source="compDirect"
@@ -119,57 +137,6 @@
                                     { id: 1, name: '澶т簬' },
                                     { id: 0, name: '灏忎簬' },
                                 ]}
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <ReferenceInput
-                                source="locSts"
-                                reference="locSts"
-                                perPage={REFERENCE_INPUT_PAGESIZE}
-                            >
-                                <AutocompleteInput
-                                    label="table.field.loc.locSts"
-                                    optionText="name"
-                                    filterToQuery={(val) => ({ name: val })}
-                                />
-                            </ReferenceInput>
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <NumberInput
-                                label="table.field.loc.offset"
-                                source="offset"
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <NumberInput
-                                label="table.field.loc.row"
-                                source="row"
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <NumberInput
-                                label="table.field.loc.bay"
-                                source="bay"
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <NumberInput
-                                label="table.field.loc.lev"
-                                source="lev"
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <TextInput
-                                label="table.field.loc.barcode"
-                                source="barcode"
-                                parse={v => v}
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <TextInput
-                                label="table.field.loc.zpallet"
-                                source="zpallet"
-                                parse={v => v}
                             />
                         </Stack>
                         <Stack direction='row' gap={2}>
@@ -184,13 +151,40 @@
                                     filterToQuery={(val) => ({ name: val })}
                                 />
                             </ReferenceInput>
+                            <NumberInput
+                                label="table.field.loc.offset"
+                                source="offset"
+                            />
                         </Stack>
-
+                        <Stack direction='row' gap={2}>
+                            <TextInput
+                                label="table.field.loc.barcode"
+                                source="barcode"
+                                parse={v => v}
+                            />
+                            <TextInput
+                                label="table.field.loc.zpallet"
+                                source="zpallet"
+                                parse={v => v}
+                            />
+                        </Stack>
                     </Grid>
                     <Grid item xs={12} md={4}>
                         <Typography variant="h6" gutterBottom>
                             {translate('common.edit.title.common')}
                         </Typography>
+                        <ReferenceInput
+                            source="locSts"
+                            reference="locSts"
+                            perPage={REFERENCE_INPUT_PAGESIZE}
+                        >
+                            <AutocompleteInput
+                                label="table.field.loc.locSts"
+                                optionText="name"
+                                filterToQuery={(val) => ({ name: val })}
+                                validate={required()}
+                            />
+                        </ReferenceInput>
                         <StatusSelectInput />
                         <Box mt="2em" />
                         <MemoInput />

--
Gitblit v1.9.1