From 9f658fb63d1c219ae65ffcf13af6efbff5179b00 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 05 二月 2026 10:46:10 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/loc/compDirect.js | 20 +++++++-------------
zy-acs-flow/src/page/loc/LocList.jsx | 17 +++++++++--------
zy-acs-flow/src/i18n/en.js | 4 ++--
zy-acs-flow/src/i18n/zh.js | 4 ++--
4 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 4d0d3ef..ebcb642 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -343,9 +343,9 @@
locNo: "loc No.",
name: "name",
code: "code",
- compDirect: "code direct",
+ compDirect: "actuator direction",
locSts: "loc sts",
- offset: "offset",
+ offset: "height",
row: "row",
bay: "bay",
lev: "lev",
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index cf6f8d4..51cb839 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -343,9 +343,9 @@
locNo: "搴撲綅鍙�",
name: "鍚嶇О",
code: "鍦伴潰鐮�",
- compDirect: "鐮佹柟鍚�",
+ compDirect: "璐у弶鏂瑰悜",
locSts: "搴撲綅鐘舵��",
- offset: "鍋忕Щ閲�",
+ offset: "楂樺害",
row: "鎺�",
bay: "鍒�",
lev: "灞�",
diff --git a/zy-acs-flow/src/page/loc/LocList.jsx b/zy-acs-flow/src/page/loc/LocList.jsx
index 379f126..657c561 100644
--- a/zy-acs-flow/src/page/loc/LocList.jsx
+++ b/zy-acs-flow/src/page/loc/LocList.jsx
@@ -68,6 +68,7 @@
}));
const filters = [
+ <SearchInput source="condition" alwaysOn />,
<TextInput source="locNo" label="table.field.loc.locNo" alwaysOn />,
<ReferenceInput source="locSts" label="table.field.loc.locSts" reference="locSts" alwaysOn>
<AutocompleteInput label="table.field.loc.locSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
@@ -75,8 +76,7 @@
<NumberInput source="row" label="table.field.loc.row" alwaysOn />,
<NumberInput source="bay" label="table.field.loc.bay" alwaysOn />,
<NumberInput source="lev" label="table.field.loc.lev" alwaysOn />,
- <SearchInput source="condition" alwaysOn />,
- <ReferenceInput source="code" label="table.field.loc.code" reference="code" alwaysOn>
+ <ReferenceInput source="code" label="table.field.loc.code" reference="code">
<AutocompleteInput label="table.field.loc.code" optionText="data" filterToQuery={(val) => ({ data: val })} />
</ReferenceInput>,
<DateInput label='common.time.after' source="timeStart" />,
@@ -158,7 +158,8 @@
rowClick={(id, resource, record) => false}
expand={() => <LocPanel />}
expandSingle={true}
- omit={['id', 'locType', 'uuid', 'statusBool', 'updateBy', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'locType', 'uuid', 'zpallet', 'barcode'
+ , 'statusBool', 'updateBy', 'createTime', 'createBy', 'memo']}
rowSx={rowSx(drawerVal || null)}
>
<NumberField source="id" />
@@ -172,11 +173,6 @@
<ReferenceField source="code" label="table.field.loc.code" reference="code" link={false} sortable={false}>
<TextField source="data" />
</ReferenceField>
- <FunctionField
- label="table.field.loc.compDirect"
- sortable={false}
- render={(record) => getCompDirectLabel(translate, record?.compDirect)}
- />
<ReferenceField source="locSts" label="table.field.loc.locSts" reference="locSts" link={false} sortable={true}>
<TextField source="name" />
</ReferenceField>
@@ -184,6 +180,11 @@
<NumberField source="bay" label="table.field.loc.bay" />
<NumberField source="lev" label="table.field.loc.lev" />
<NumberField source="offset" label="table.field.loc.offset" />
+ <FunctionField
+ label="table.field.loc.compDirect"
+ sortable={false}
+ render={(record) => getCompDirectLabel(translate, record?.compDirect)}
+ />
<TextField source="barcode" label="table.field.loc.barcode" />
<TextField source="zpallet" label="table.field.loc.zpallet" />
<ReferenceField source="locType" label="table.field.loc.locType" reference="locType" link={false} sortable={false}>
diff --git a/zy-acs-flow/src/page/loc/compDirect.js b/zy-acs-flow/src/page/loc/compDirect.js
index f9c1bee..697ab1e 100644
--- a/zy-acs-flow/src/page/loc/compDirect.js
+++ b/zy-acs-flow/src/page/loc/compDirect.js
@@ -1,21 +1,15 @@
-const compDirectMap = {
- 1: 'page.loc.enums.compDirect.left',
- 2: 'page.loc.enums.compDirect.right',
- 3: 'page.loc.enums.compDirect.forward',
-};
-
export const compDirectChoices = [
- { id: 1, name: compDirectMap[1] },
- { id: 2, name: compDirectMap[2] },
- { id: 3, name: compDirectMap[3] },
+ { id: 1, name: 'page.loc.enums.compDirect.left' },
+ { id: 2, name: 'page.loc.enums.compDirect.right' },
+ { id: 3, name: 'page.loc.enums.compDirect.forward' },
];
export const getCompDirectLabel = (translate, compDirect, fallback = '-') => {
- const key = compDirectMap[compDirect];
- if (!key) {
+ const choice = compDirectChoices.find((item) => item.id === compDirect);
+ if (!choice) {
return fallback;
}
return typeof translate === 'function'
- ? translate(key, { _: fallback })
- : key;
+ ? translate(choice.name, { _: fallback })
+ : choice.name;
};
--
Gitblit v1.9.1