From a5e63e8c80490d1c8c0ad48556cb54dc056ec301 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 19 九月 2024 15:48:22 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/page/funcSta/FuncStaCreate.jsx |   21 +++++++---
 zy-acs-flow/src/page/funcSta/FuncStaEdit.jsx   |   36 ++++++++---------
 zy-acs-flow/src/i18n/en.js                     |   12 ++++++
 zy-acs-flow/src/page/funcSta/FuncStaList.jsx   |   30 +++++++++++----
 zy-acs-flow/src/i18n/zh.js                     |   14 ++++++
 5 files changed, 78 insertions(+), 35 deletions(-)

diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 66a91f1..0631c10 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -520,6 +520,18 @@
             },
             levOffset: 'lev offset',
             bottomOffset: 'bottom offset',
+        },
+        funcSta: {
+            enums: {
+                type: {
+                    charge: 'Charge',
+                    standby: 'Standby',
+                },
+                state: {
+                    idle: 'Idle',
+                    occupied: 'Occupied',
+                }
+            }
         }
     }
 };
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 4976480..3a0c4c7 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -16,7 +16,7 @@
             createTime: '娣诲姞鏃堕棿',
             createBy: '娣诲姞浜哄憳',
             updateTime: '淇敼鏃堕棿',
-            updateBy: '淇敼鍛�',
+            updateBy: '淇敼浜哄憳',
             status: '鐘舵��',
             memoWrap: '鏄剧ず澶囨敞',
             memo: '澶囨敞',
@@ -519,6 +519,18 @@
             },
             levOffset: '姣忓眰楂樺害',
             bottomOffset: '搴曢儴鍋忕Щ閲�',
+        },
+        funcSta: {
+            enums: {
+                type: {
+                    charge: '鍏呯數浣�',
+                    standby: '寰呮満浣�',
+                },
+                state: {
+                    idle: '绌洪棽',
+                    occupied: '蹇欑',
+                }
+            }
         }
     }
 };
diff --git a/zy-acs-flow/src/page/funcSta/FuncStaCreate.jsx b/zy-acs-flow/src/page/funcSta/FuncStaCreate.jsx
index ed4b8f9..b8e9ea2 100644
--- a/zy-acs-flow/src/page/funcSta/FuncStaCreate.jsx
+++ b/zy-acs-flow/src/page/funcSta/FuncStaCreate.jsx
@@ -124,9 +124,13 @@
                                     />
                                 </Grid>
                                 <Grid item xs={6} display="flex" gap={1}>
-                                    <TextInput
-                                        label="table.field.funcSta.type"
+                                    <SelectInput
                                         source="type"
+                                        label="table.field.funcSta.type"
+                                        choices={[
+                                            { id: 'CHARGE', name: 'page.funcSta.enums.type.charge' },
+                                            { id: 'STANDBY', name: 'page.funcSta.enums.type.standby' },
+                                        ]}
                                         parse={v => v}
                                     />
                                 </Grid>
@@ -150,16 +154,19 @@
                                     />
                                 </Grid>
                                 <Grid item xs={6} display="flex" gap={1}>
-                                    <TextInput
-                                        label="table.field.funcSta.state"
+                                    <SelectInput
                                         source="state"
+                                        label="table.field.funcSta.state"
+                                        choices={[
+                                            { id: 'IDLE', name: 'page.funcSta.enums.state.idle' },
+                                            { id: 'OCCUPIED', name: 'page.funcSta.enums.state.occupied' },
+                                        ]}
                                         parse={v => v}
                                     />
                                 </Grid>
-
-                                <Grid item xs={6} display="flex" gap={1}>
+                                {/* <Grid item xs={6} display="flex" gap={1}>
                                     <StatusSelectInput />
-                                </Grid>
+                                </Grid> */}
                                 <Grid item xs={12} display="flex" gap={1}>
                                     <Stack direction="column" spacing={1} width={'100%'}>
                                         <MemoInput />
diff --git a/zy-acs-flow/src/page/funcSta/FuncStaEdit.jsx b/zy-acs-flow/src/page/funcSta/FuncStaEdit.jsx
index 4b05f84..ba3be2e 100644
--- a/zy-acs-flow/src/page/funcSta/FuncStaEdit.jsx
+++ b/zy-acs-flow/src/page/funcSta/FuncStaEdit.jsx
@@ -64,14 +64,6 @@
                             {translate('common.edit.title.main')}
                         </Typography>
                         <Stack direction='row' gap={2}>
-                            <TextInput
-                                label="table.field.funcSta.uuid"
-                                source="uuid"
-                                parse={v => v}
-                                autoFocus
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
                             <ReferenceInput
                                 source="zoneId"
                                 reference="zone"
@@ -83,8 +75,6 @@
                                     filterToQuery={(val) => ({ name: val })}
                                 />
                             </ReferenceInput>
-                        </Stack>
-                        <Stack direction='row' gap={2}>
                             <ReferenceInput
                                 source="agvId"
                                 reference="agv"
@@ -103,15 +93,22 @@
                                 source="name"
                                 parse={v => v}
                             />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
                             <TextInput
-                                label="table.field.funcSta.type"
-                                source="type"
+                                label="table.field.funcSta.uuid"
+                                source="uuid"
                                 parse={v => v}
                             />
                         </Stack>
                         <Stack direction='row' gap={2}>
+                            <SelectInput
+                                source="type"
+                                label="table.field.funcSta.type"
+                                choices={[
+                                    { id: 'CHARGE', name: 'page.funcSta.enums.type.charge' },
+                                    { id: 'STANDBY', name: 'page.funcSta.enums.type.standby' },
+                                ]}
+                                parse={v => v}
+                            />
                             <ReferenceInput
                                 source="code"
                                 reference="code"
@@ -130,15 +127,16 @@
                                 source="angle"
                                 parse={v => v}
                             />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <TextInput
-                                label="table.field.funcSta.state"
+                            <SelectInput
                                 source="state"
+                                label="table.field.funcSta.state"
+                                choices={[
+                                    { id: 'IDLE', name: 'page.funcSta.enums.state.idle' },
+                                    { id: 'OCCUPIED', name: 'page.funcSta.enums.state.occupied' },
+                                ]}
                                 parse={v => v}
                             />
                         </Stack>
-
                     </Grid>
                     <Grid item xs={12} md={4}>
                         <Typography variant="h6" gutterBottom>
diff --git a/zy-acs-flow/src/page/funcSta/FuncStaList.jsx b/zy-acs-flow/src/page/funcSta/FuncStaList.jsx
index eedc4ca..f41b3e9 100644
--- a/zy-acs-flow/src/page/funcSta/FuncStaList.jsx
+++ b/zy-acs-flow/src/page/funcSta/FuncStaList.jsx
@@ -66,17 +66,32 @@
     <ReferenceInput source="zoneId" label="table.field.funcSta.zoneId" reference="zone">
         <AutocompleteInput label="table.field.funcSta.zoneId" optionText="name" filterToQuery={(val) => ({ name: val })} />
     </ReferenceInput>,
-    <ReferenceInput source="agvId" label="table.field.funcSta.agvId" reference="agv">
+    <ReferenceInput source="agvId" label="table.field.funcSta.agvId" reference="agv" alwaysOn>
         <AutocompleteInput label="table.field.funcSta.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
     </ReferenceInput>,
     <TextInput source="name" label="table.field.funcSta.name" />,
-    <TextInput source="type" label="table.field.funcSta.type" />,
+    <SelectInput
+        source="type"
+        label="table.field.funcSta.type"
+        choices={[
+            { id: 'CHARGE', name: 'page.funcSta.enums.type.charge' },
+            { id: 'STANDBY', name: 'page.funcSta.enums.type.standby' },
+        ]}
+        alwaysOn
+    />,
+    <SelectInput
+        source="state"
+        label="table.field.funcSta.state"
+        choices={[
+            { id: 'IDLE', name: 'page.funcSta.enums.state.idle' },
+            { id: 'OCCUPIED', name: 'page.funcSta.enums.state.occupied' },
+        ]}
+        alwaysOn
+    />,
     <ReferenceInput source="code" label="table.field.funcSta.code" reference="code">
         <AutocompleteInput label="table.field.funcSta.code" optionText="data" filterToQuery={(val) => ({ data: val })} />
     </ReferenceInput>,
     <TextInput source="angle" label="table.field.funcSta.angle" />,
-    <TextInput source="state" label="table.field.funcSta.state" />,
-
     <TextInput label="common.field.memo" source="memo" />,
     <SelectInput
         label="common.field.status"
@@ -128,21 +143,20 @@
                     omit={['id', 'createTime', 'createBy', 'memo']}
                 >
                     <NumberField source="id" />
-                    <TextField source="uuid" label="table.field.funcSta.uuid" />
                     <ReferenceField source="zoneId" label="table.field.funcSta.zoneId" reference="zone" link={false} sortable={false}>
                         <TextField source="name" />
                     </ReferenceField>
+                    <TextField source="name" label="table.field.funcSta.name" />
+                    <TextField source="uuid" label="table.field.funcSta.uuid" />
                     <ReferenceField source="agvId" label="table.field.funcSta.agvId" reference="agv" link={false} sortable={false}>
                         <TextField source="uuid" />
                     </ReferenceField>
-                    <TextField source="name" label="table.field.funcSta.name" />
                     <TextField source="type" label="table.field.funcSta.type" />
+                    <TextField source="state" label="table.field.funcSta.state" />
                     <ReferenceField source="code" label="table.field.funcSta.code" reference="code" link={false} sortable={false}>
                         <TextField source="data" />
                     </ReferenceField>
                     <TextField source="angle" label="table.field.funcSta.angle" />
-                    <TextField source="state" label="table.field.funcSta.state" />
-
                     <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                         <TextField source="nickname" />
                     </ReferenceField>

--
Gitblit v1.9.1