From 6f5a86b74457f2fdad3caa63f3378e81624d47d2 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期三, 11 二月 2026 08:22:14 +0800
Subject: [PATCH] 优化基础信息页面字段
---
rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx | 137 ++++++++--------
rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx | 31 +--
rsf-admin/src/page/basicInfo/basContainer/BasContainerCreate.jsx | 8 +
rsf-admin/src/page/basicInfo/basContainer/BasContainerList.jsx | 1
rsf-admin/src/page/basicInfo/basContainer/BasContainerEdit.jsx | 11 +
rsf-admin/src/i18n/core/chineseMessages.js | 66 ++++----
rsf-admin/src/i18n/zh.js | 22 +-
rsf-admin/src/page/basicInfo/basStation/BasStationEdit.jsx | 151 +++++++++---------
rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx | 22 +
rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx | 8
10 files changed, 243 insertions(+), 214 deletions(-)
diff --git a/rsf-admin/src/i18n/core/chineseMessages.js b/rsf-admin/src/i18n/core/chineseMessages.js
index 1565801..bcfbe89 100644
--- a/rsf-admin/src/i18n/core/chineseMessages.js
+++ b/rsf-admin/src/i18n/core/chineseMessages.js
@@ -6,7 +6,7 @@
back: "杩斿洖",
bulk_actions: "%{smart_count} 鏉¤閫変腑 |||| %{smart_count} 鏉¤閫変腑",
cancel: "鍙栨秷",
- clear_array_input: "鎯呯┖鍒楄〃",
+ clear_array_input: "娓呯┖鍒楄〃",
clear_input_value: "娓呯┖",
clone: "鍏嬮殕",
confirm: "纭畾",
@@ -33,12 +33,12 @@
unselect: "鍙栨秷閫夋嫨",
expand: "灞曞紑",
close: "鍏抽棴",
- open_menu: "Open menu",
- close_menu: "Close menu",
+ open_menu: "鎵撳紑鑿滃崟",
+ close_menu: "鍏抽棴鑿滃崟",
update: "淇敼",
- move_up: "Move up",
- move_down: "Move down",
- open: "Open",
+ move_up: "鍚戜笂绉诲姩",
+ move_down: "鍚戜笅绉诲姩",
+ open: "鎵撳紑",
toggle_theme: "娴呰壊/娣辫壊",
select_columns: "绛涢�夊垪",
update_application: "Reload Application",
@@ -49,16 +49,16 @@
null: "鈥�",
},
page: {
- create: "Create %{name}",
- dashboard: "Dashboard",
+ create: "鏂板 %{name}",
+ dashboard: "鎺у埗鍙�",
edit: "%{name} %{recordRepresentation}",
- error: "Something went wrong",
+ error: "鍑洪敊浜�",
list: "%{name}",
- loading: "Loading",
- not_found: "Not Found",
+ loading: "鍔犺浇涓�",
+ not_found: "鏈壘鍒�",
show: "%{name} %{recordRepresentation}",
empty: "No %{name} yet.",
- invite: "Do you want to add one?",
+ invite: "鏄惁鏂板涓�涓�?",
},
input: {
file: {
@@ -77,15 +77,15 @@
"Associated reference no longer appears to be available.",
},
password: {
- toggle_visible: "Hide password",
- toggle_hidden: "Show password",
+ toggle_visible: "闅愯棌瀵嗙爜",
+ toggle_hidden: "灞曠ず瀵嗙爜",
},
},
message: {
- about: "About",
- are_you_sure: "Are you sure?",
+ about: "鍏充簬",
+ are_you_sure: "鏄惁纭?",
auth_error:
- "An error occurred while validating the authentication token.",
+ "鎺堟潈楠岃瘉鍑洪敊銆�",
bulk_delete_content:
"纭畾瑕佸垹闄よ繖涓� %{name}? |||| 纭瑕佸垹闄よ繖浜� %{smart_count} 鏄庣粏?",
bulk_delete_title: "鍒犻櫎 %{name} |||| 鍒犻櫎 %{smart_count} %{name}",
@@ -96,14 +96,14 @@
delete_content: "鎮ㄧ‘瀹炶鍒犻櫎姝ら」鍚楋紵",
delete_title: "鍒犻櫎 %{name} #%{id}",
details: "Details",
- error: "A client error occurred and your request couldn't be completed.",
+ error: "璇锋眰鍑洪敊銆�",
delete_success: '鍒犻櫎鎴愬姛锛�',
delete_fail: '鍒犻櫎澶辫触锛�',
invalid_form: "琛ㄥ崟鏃犳晥 璇锋鏌ユ槸鍚︽湁閿欒!",
- loading: "Please wait",
- no: "No",
+ loading: "璇风◢浣滅瓑寰�",
+ no: "鍚�",
not_found: "Either you typed a wrong URL, or you followed a bad link.",
- yes: "Yes",
+ yes: "鏄�",
unsaved_changes:
"鎮ㄦ墍鍋氱殑閮ㄥ垎鏇存敼灏氭湭淇濆瓨銆傜‘瀹氳蹇界暐杩欎簺鏇存敼鍚楋紵",
},
@@ -117,12 +117,12 @@
page_range_info: "%{offsetBegin}-%{offsetEnd} of %{total}",
partial_page_range_info:
"%{offsetBegin}-%{offsetEnd} of more than %{offsetEnd}",
- current_page: "Page %{page}",
- page: "Go to page %{page}",
- first: "Go to first page",
- last: "Go to last page",
- next: "Go to next page",
- previous: "Go to previous page",
+ current_page: "绗� %{page} 椤�",
+ page: "鍘荤 %{page} 椤�",
+ first: "绗竴椤�",
+ last: "鏈�鍚庝竴椤�",
+ next: "涓嬩竴椤�",
+ previous: "鍓嶄竴椤�",
page_rows_per_page: "姣忛〉鏁伴噺:",
skip_nav: "Skip to content",
},
@@ -132,12 +132,12 @@
DESC: "闄嶅簭鎺掑垪",
},
auth: {
- auth_check_error: "Please login to continue",
+ auth_check_error: "璇锋偍鍏堢櫥褰�",
user_menu: "Profile",
- username: "Username",
- password: "Password",
- sign_in: "Sign in",
- sign_in_error: "Authentication failed, please retry",
+ username: "璐﹀彿",
+ password: "瀵嗙爜",
+ sign_in: "鐧诲綍",
+ sign_in_error: "璁よ瘉澶辫触锛岃鎮ㄩ噸璇�",
logout: "娉ㄩ攢",
},
notification: {
@@ -168,7 +168,7 @@
},
saved_queries: {
label: "淇濆瓨杩囨护",
- query_name: "Query name",
+ query_name: "鎸夊悕绉版煡璇�",
new_label: "淇濆瓨杩囨护鏉′欢...",
new_dialog_title: "Save current query as",
remove_label: "绉婚櫎杩囨护鏉′欢",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 293103c..cdf460c 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -210,8 +210,8 @@
deviceBind: '璁惧缁戝畾',
tasks: '浠诲姟绠＄悊',
wave: '娉㈡绠＄悊',
- basStation: '绔欑偣淇℃伅',
- basContainer: '瀹瑰櫒绠＄悊',
+ basStation: '绔欑偣绠＄悊',
+ basContainer: '瀹瑰櫒瑙勫垯',
outBound: '鍑哄簱浣滀笟',
checkOutBound: '鐩樼偣鍑哄簱',
stockTransfer: '搴撲綅杞Щ',
@@ -355,13 +355,13 @@
containerType: '瀹瑰櫒绫诲瀷',
startNo: '璧峰鏁板��',
endNo: '缁撴潫鏁板��',
- code: '鏉＄爜',
- codeType: '鏉＄爜绫诲瀷',
+ code: '缂栫爜璧峰瀛楃',
+ codeType: '缂栫爜瑙勫垯',
areas: '鍙叆搴撳尯',
},
basStation: {
- stationName: '绔欑偣缂栧彿',
- stationId: '绔欑偣鍚嶇О',
+ stationName: '绔欑偣鍚嶇О',
+ stationId: '绔欑偣缂栫爜',
type: '绔欑偣绫诲瀷',
inAble: '鑳藉叆',
outAble: '鑳藉嚭',
@@ -372,8 +372,8 @@
crossZoneArea: '鍙法搴撳尯',
isWcs: '鏄惁WCS绔欑珯鐐�',
wcsData: 'wcs鏁版嵁',
- containerType: '瀹瑰櫒绫诲瀷',
- barcode: '瀹瑰櫒缂栫爜',
+ containerType: '鍙叆瀹瑰櫒绫诲瀷',
+ barcode: '褰撳墠瀹瑰櫒缂栫爜',
autoTransfer: '鑷姩璋冩嫧',
},
host: {
@@ -518,7 +518,7 @@
nromNum: "鏍囧寘鏁伴噺",
unit: "鍗曚綅",
purUnit: "閲囪喘鍗曚綅",
- stockUnit: "浣跨敤缁勭粐", //"搴撳瓨鍗曚綅",
+ stockUnit: "搴撳瓨鍗曚綅",
stockLevel: "ABC鍒嗙被",
isLabelMange: "鏍囩绠＄悊",
safeQty: "瀹夊叏鍊�",
@@ -529,6 +529,8 @@
validWarn: "鏁堟湡棰勮(澶�)",
flagCheck: "鍏嶆",
tenantId: "浣跨敤缁勭粐",
+ useOrgId: "浣跨敤缁勭粐缂栫爜",
+ useOrgName: "浣跨敤缁勭粐",
},
matnrGroup: {
name: "鐗╂枡鍒嗙粍鍚嶇О",
@@ -636,7 +638,7 @@
},
locType: {
name: "搴撲綅绫诲瀷",
- code: "缂栧彿",
+ code: "缂栫爜",
regex: "瑙勫垯琛ㄨ揪寮�",
},
locArea: {
diff --git a/rsf-admin/src/page/basicInfo/basContainer/BasContainerCreate.jsx b/rsf-admin/src/page/basicInfo/basContainer/BasContainerCreate.jsx
index 4c1180e..465a7a8 100644
--- a/rsf-admin/src/page/basicInfo/basContainer/BasContainerCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/basContainer/BasContainerCreate.jsx
@@ -97,6 +97,14 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
+ label="table.field.basContainer.code"
+ source="code"
+ validate={[required()]}
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
label="table.field.basContainer.codeType"
source="codeType"
validate={[required()]}
diff --git a/rsf-admin/src/page/basicInfo/basContainer/BasContainerEdit.jsx b/rsf-admin/src/page/basicInfo/basContainer/BasContainerEdit.jsx
index e0d70ae..b57a119 100644
--- a/rsf-admin/src/page/basicInfo/basContainer/BasContainerEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/basContainer/BasContainerEdit.jsx
@@ -122,6 +122,13 @@
</Stack>
<Stack direction='row' gap={2}>
<TextInput
+ label="table.field.basContainer.code"
+ source="code"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
label="table.field.basContainer.codeType"
source="codeType"
parse={v => v}
@@ -163,14 +170,14 @@
<TextInput source="areasSort" style={{ display: 'none' }} />
</Grid>
- <Grid item xs={12} md={4}>
+ {/* <Grid item xs={12} md={4}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
<StatusSelectInput />
<Box mt="2em" />
<MemoInput />
- </Grid>
+ </Grid> */}
</Grid>
</SimpleForm>
</Edit >
diff --git a/rsf-admin/src/page/basicInfo/basContainer/BasContainerList.jsx b/rsf-admin/src/page/basicInfo/basContainer/BasContainerList.jsx
index 722bb6e..56e19ee 100644
--- a/rsf-admin/src/page/basicInfo/basContainer/BasContainerList.jsx
+++ b/rsf-admin/src/page/basicInfo/basContainer/BasContainerList.jsx
@@ -120,6 +120,7 @@
>
<NumberField source="id" />
<NumberField source="containerType$" label="table.field.basContainer.containerType" />
+ <TextField source="code" label="table.field.basContainer.code" />
<TextField source="codeType" label="table.field.basContainer.codeType" />
<WrapperField cellClassName="areas" label="table.field.basContainer.areas">
<CrossZoneAreaField
diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx
index 2062d7d..b73e16b 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx
@@ -110,10 +110,72 @@
label="table.field.basStation.type"
source="type"
choices={[
- { id: 0, name: '鍏夌數' },
- { id: 1, name: '鏃犲厜鐢�' },
+ { id: 0, name: '鏅鸿兘绔欑偣' },
+ { id: 1, name: '鏅�氱珯鐐�' },
]}
validate={[required()]}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <DictionarySelect
+ label={translate("table.field.basStation.useStatus")}
+ name="useStatus"
+ size="small"
+ // validate={[required()]}
+ dictTypeCode="sys_sta_use_stas"
+ />
+ </Grid>
+ {/* <Grid item xs={6} display="flex" gap={1}>
+ <ReferenceInput source="area" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
+ <SelectInput
+ label="table.field.basStation.area"
+ optionText="name"
+ optionValue="id"
+ fullWidth
+ validate={[required()]}
+ />
+ </ReferenceInput>
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <SelectInput
+ label="table.field.basStation.isCrossZone"
+ source="isCrossZone"
+ choices={[
+ { id: 0, name: '鍚�' },
+ { id: 1, name: '鏄�' },
+ ]}
+ validate={[required()]}
+ />
+ </Grid> */}
+ <Grid item xs={6} display="flex" gap={1}>
+ <ReferenceArrayInput source="areaIds" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
+ <SelectArrayInput
+ label="table.field.basStation.crossZoneArea"
+ optionText="name"
+ optionValue="id"
+ fullWidth
+ validate={[required()]}
+ />
+ </ReferenceArrayInput>
+ </Grid>
+ {/* <Grid item xs={6} display="flex" gap={1}>
+ <SelectInput
+ label="table.field.basStation.isWcs"
+ source="isWcs"
+ choices={[
+ { id: 0, name: '鍚�' },
+ { id: 1, name: '鏄�' },
+ ]}
+ validate={[required()]}
+ />
+ </Grid> */}
+ <Grid item xs={6} display="flex" gap={1}>
+ <DictionaryArraySelect
+ label={translate("table.field.basStation.containerType")}
+ name="containerTypes"
+ size="small"
+ validate={[required()]}
+ dictTypeCode="sys_container_type"
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -138,69 +200,7 @@
validate={[required()]}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <DictionarySelect
- label={translate("table.field.basStation.useStatus")}
- name="useStatus"
- size="small"
- validate={[required()]}
- dictTypeCode="sys_sta_use_stas"
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <ReferenceInput source="area" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
- <SelectInput
- label="table.field.basStation.area"
- optionText="name"
- optionValue="id"
- fullWidth
- validate={[required()]}
- />
- </ReferenceInput>
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <SelectInput
- label="table.field.basStation.isCrossZone"
- source="isCrossZone"
- choices={[
- { id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
- ]}
- validate={[required()]}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <ReferenceArrayInput source="areaIds" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
- <SelectArrayInput
- label="table.field.basStation.crossZoneArea"
- optionText="name"
- optionValue="id"
- fullWidth
- validate={[required()]}
- />
- </ReferenceArrayInput>
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <SelectInput
- label="table.field.basStation.isWcs"
- source="isWcs"
- choices={[
- { id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
- ]}
- validate={[required()]}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <DictionaryArraySelect
- label={translate("table.field.basStation.containerType")}
- name="containerTypes"
- size="small"
- validate={[required()]}
- dictTypeCode="sys_container_type"
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<SelectInput
label="table.field.basStation.autoTransfer"
source="autoTransfer"
@@ -210,13 +210,12 @@
]}
validate={[required()]}
/>
- </Grid>
-
- <Grid item xs={12} display="flex" gap={1}>
+ </Grid> */}
+ {/* <Grid item xs={12} display="flex" gap={1}>
<Stack direction="column" spacing={1} width={'100%'}>
<MemoInput />
</Stack>
- </Grid>
+ </Grid> */}
</Grid>
</DialogContent>
<DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationEdit.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationEdit.jsx
index 4977d7b..3c6713d 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationEdit.jsx
@@ -87,11 +87,82 @@
label="table.field.basStation.type"
source="type"
choices={[
- { id: 0, name: '鍏夌數' },
- { id: 1, name: '鏃犲厜鐢�' },
+ { id: 0, name: '鏅鸿兘绔欑偣' },
+ { id: 1, name: '鏅�氱珯鐐�' },
]}
/>
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <DictionarySelect
+ label={translate("table.field.basStation.useStatus")}
+ name="useStatus"
+ size="small"
+ validate={[required()]}
+ dictTypeCode="sys_sta_use_stas"
+ />
</Stack>
+ {/* <Stack direction='row' gap={2}>
+ <ReferenceInput source="area" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
+ <SelectInput
+ label="table.field.basStation.area"
+ optionText="name"
+ optionValue="id"
+ fullWidth
+ validate={[required()]}
+ />
+ </ReferenceInput>
+ </Stack> */}
+ {/* <Stack direction='row' gap={2}>
+ <SelectInput
+ label="table.field.basStation.isCrossZone"
+ source="isCrossZone"
+ choices={[
+ { id: 0, name: '鍚�' },
+ { id: 1, name: '鏄�' },
+ ]}
+ validate={[required()]}
+ />
+ </Stack> */}
+ <Stack direction='row' gap={2}>
+ <ReferenceArrayInput source="areaIds" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
+ <SelectArrayInput
+ label="table.field.basStation.crossZoneArea"
+ optionText="name"
+ optionValue="id"
+ fullWidth
+ />
+ </ReferenceArrayInput>
+ </Stack>
+ {/* <Stack direction='row' gap={2}>
+ <SelectInput
+ label="table.field.basStation.isWcs"
+ source="isWcs"
+ choices={[
+ { id: 0, name: '鍚�' },
+ { id: 1, name: '鏄�' },
+ ]}
+ validate={[required()]}
+ />
+ </Stack> */}
+ <Stack direction='row' gap={2}>
+ <DictionaryArraySelect
+ label={translate("table.field.basStation.containerType")}
+ name="containerTypes"
+ size="small"
+ validate={[required()]}
+ dictTypeCode="sys_container_type"
+ />
+ </Stack>
+ {/* <Stack direction='row' gap={2}>
+ <SelectInput
+ label="table.field.basStation.autoTransfer"
+ source="autoTransfer"
+ choices={[
+ { id: 0, name: '鍚�' },
+ { id: 1, name: '鏄�' },
+ ]}
+ />
+ </Stack> */}
<Stack direction='row' gap={2}>
<SelectInput
label="table.field.basStation.inAble"
@@ -112,87 +183,15 @@
]}
/>
</Stack>
- <Stack direction='row' gap={2}>
- <DictionarySelect
- label={translate("table.field.basStation.useStatus")}
- name="useStatus"
- size="small"
- validate={[required()]}
- dictTypeCode="sys_sta_use_stas"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <ReferenceInput source="area" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
- <SelectInput
- label="table.field.basStation.area"
- optionText="name"
- optionValue="id"
- fullWidth
- validate={[required()]}
- />
- </ReferenceInput>
- </Stack>
- <Stack direction='row' gap={2}>
- <SelectInput
- label="table.field.basStation.isCrossZone"
- source="isCrossZone"
- choices={[
- { id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
- ]}
- validate={[required()]}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <ReferenceArrayInput source="areaIds" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
- <SelectArrayInput
- label="table.field.basStation.crossZoneArea"
- optionText="name"
- optionValue="id"
- fullWidth
- />
- </ReferenceArrayInput>
- </Stack>
- <Stack direction='row' gap={2}>
- <SelectInput
- label="table.field.basStation.isWcs"
- source="isWcs"
- choices={[
- { id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
- ]}
- validate={[required()]}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <DictionaryArraySelect
- label={translate("table.field.basStation.containerType")}
- name="containerTypes"
- size="small"
- validate={[required()]}
- dictTypeCode="sys_container_type"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <SelectInput
- label="table.field.basStation.autoTransfer"
- source="autoTransfer"
- choices={[
- { id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
- ]}
- />
- </Stack>
-
</Grid>
- <Grid item xs={12} md={4}>
+ {/* <Grid item xs={12} md={4}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
<StatusSelectInput />
<Box mt="2em" />
<MemoInput />
- </Grid>
+ </Grid> */}
</Grid>
</SimpleForm>
</Edit >
diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
index 092025f..8e9407d 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
@@ -131,18 +131,28 @@
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'updateBy', 'autoTransfer']}
+ omit={['id', 'createTime', 'createBy', 'createBy$', 'memo', 'updateBy$', 'updateTime', 'autoTransfer', 'isCrossZone', 'isWcs', 'area$', 'memo']}
>
<NumberField source="id" />
- {/* <TextField source="type$" label="table.field.basStation.type" /> */}
+ {/* <TextField source="type$" label="table.field.basStation.type" /> */}
+ <TextField source="stationName" label="table.field.basStation.stationName" />
+ <TextField source="stationId" label="table.field.basStation.stationId" />
<FunctionField
source="type"
label="table.field.basStation.type"
render={record => record.type === 1 ? '鏅�氱珯鐐�' : '鏅鸿兘绔欑偣'}
/>
- <TextField source="stationName" label="table.field.basStation.stationName" />
- <TextField source="stationId" label="table.field.basStation.stationId" />
<TextField source="useStatus$" label="table.field.basStation.useStatus" />
+ <WrapperField cellClassName="containerType" label="table.field.basStation.containerType">
+ <ChipArrayField
+ source="containerTypes$"
+ apiEndpoint="/dictData/many/{ids}"
+ labelField="label"
+ dialogTitle={translate('table.field.basStation.containerType')}
+ initialDisplayCount={1}
+ placeholderText="{count} 涓尯鍩�"
+ />
+ </WrapperField>
<TextField source="barcode" label="table.field.basStation.barcode" />
<FunctionField
source="inAble"
@@ -165,7 +175,6 @@
open={areaFieldDialog}
setOpen={setAreaFieldDialog}
/> */}
-
<ChipArrayField
source="areaIds"
apiEndpoint="/warehouseAreas/many/{ids}"
@@ -180,16 +189,6 @@
label="table.field.basStation.isWcs"
render={record => record.inAble === 1 ? '鏄�' : '鍚�'}
/>
- <WrapperField cellClassName="containerType" label="table.field.basStation.containerType">
- <ChipArrayField
- source="containerTypes$"
- apiEndpoint="/dictData/many/{ids}"
- labelField="label"
- dialogTitle={translate('table.field.basStation.containerType')}
- initialDisplayCount={1}
- placeholderText="{count} 涓尯鍩�"
- />
- </WrapperField>
<FunctionField
source="autoTransfer"
label="table.field.basStation.autoTransfer"
@@ -199,7 +198,7 @@
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ {/* <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' }} />
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
index fcfc444..67267a6 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
@@ -179,6 +179,13 @@
<Grid item xs={12} display="flex" gap={1}>
<Grid item xs={4} display="flex" gap={1}>
<TextInput
+ label="table.field.matnr.useOrgName"
+ source="useOrgName"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={4} display="flex" gap={1}>
+ <TextInput
label="table.field.matnr.spec"
source="spec"
parse={v => v}
@@ -258,6 +265,13 @@
parse={v => v}
/>
</Grid>
+ <Grid item xs={4} display="flex" gap={1}>
+ <TextInput
+ label="table.field.matnr.describle"
+ source="describle"
+ parse={v => v}
+ />
+ </Grid>
{/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.matnr.stockUnit"
@@ -308,13 +322,7 @@
{/* <Stack direction="column" spacing={1} width={'100%'}>
<MemoInput />
</Stack> */}
- <Grid item xs={12} display="flex" gap={1}>
- <TextInput
- label="table.field.matnr.describle"
- source="describle"
- parse={v => v}
- />
- </Grid>
+
</Grid>
</Grid>
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
index 48069ec..2b3f079 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
@@ -171,7 +171,13 @@
source="groupId"
/>
</Grid>
-
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.matnr.useOrgName"
+ source="useOrgName"
+ parse={v => v}
+ />
+ </Grid>
{/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.matnr.platCode"
--
Gitblit v1.9.1