From 987c645d41d3481b312d92611b3c0b1801d45f64 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 26 九月 2024 08:09:18 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/page/action/ActionList.jsx |    2 +-
 zy-acs-flow/src/i18n/en.js                 |    4 ++--
 zy-acs-flow/src/page/jam/JamList.jsx       |    4 ++--
 zy-acs-flow/src/i18n/zh.js                 |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index e28092b..a065ad7 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -474,7 +474,7 @@
             },
             segment: {
                 uuid: "uuid",
-                groupId: "group no",
+                groupId: "group",
                 travelId: "travel",
                 taskId: "task",
                 agvId: "agv",
@@ -505,7 +505,7 @@
             },
             action: {
                 uuid: "uuid",
-                groupId: "group no",
+                groupId: "group",
                 busId: "bus",
                 taskId: "task",
                 seqNum: "seq num",
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index a989d8e..6cb72ac 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -473,7 +473,7 @@
             },
             segment: {
                 uuid: "缂栧彿",
-                groupId: "缁勭紪鍙�",
+                groupId: "浠诲姟缁�",
                 travelId: "琛岀▼",
                 taskId: "浠诲姟",
                 agvId: "杞﹁締",
@@ -504,7 +504,7 @@
             },
             action: {
                 uuid: "缂栧彿",
-                groupId: "缁勭紪鍙�",
+                groupId: "浠诲姟缁�",
                 busId: "鎬荤嚎",
                 taskId: "浠诲姟",
                 seqNum: "鍔ㄤ綔鍙�",
diff --git a/zy-acs-flow/src/page/action/ActionList.jsx b/zy-acs-flow/src/page/action/ActionList.jsx
index cc4c9b1..3b42722 100644
--- a/zy-acs-flow/src/page/action/ActionList.jsx
+++ b/zy-acs-flow/src/page/action/ActionList.jsx
@@ -65,10 +65,10 @@
 
 const filters = [
     // <SearchInput source="condition" alwaysOn />,
+    <TextInput source="groupId" label="table.field.action.groupId" alwaysOn resettable />,
     <ReferenceInput source="agvId" label="table.field.action.agvId" reference="agv" alwaysOn>
         <AutocompleteInput label="table.field.action.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
     </ReferenceInput>,
-    <TextInput source="groupId" label="table.field.action.groupId" alwaysOn resettable />,
     <ReferenceInput source="busId" label="table.field.action.busId" reference="bus">
         <AutocompleteInput label="table.field.action.busId" optionText="busNo" filterToQuery={(val) => ({ seqNum: val })} />
     </ReferenceInput>,
diff --git a/zy-acs-flow/src/page/jam/JamList.jsx b/zy-acs-flow/src/page/jam/JamList.jsx
index d0b299e..64e27c5 100644
--- a/zy-acs-flow/src/page/jam/JamList.jsx
+++ b/zy-acs-flow/src/page/jam/JamList.jsx
@@ -132,7 +132,7 @@
                 actions={(
                     <TopToolbar>
                         <FilterButton />
-                        <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+                        {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
                         <SelectColumnsButton preferenceKey='jam' />
                         <MyExportButton />
                     </TopToolbar>
@@ -189,7 +189,7 @@
                     <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                     <TextField source="memo" label="common.field.memo" sortable={false} />
                     <WrapperField cellClassName="opt" label="common.field.opt">
-                        <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
+                        {/* <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} /> */}
                         <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
                     </WrapperField>
                 </StyledDatagrid>

--
Gitblit v1.9.1