From d66646f4fc936682e08f0cc7e5ba887a6b8a03c6 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期五, 21 三月 2025 10:46:50 +0800
Subject: [PATCH] fix:仓库编码
---
rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx | 2 +-
rsf-admin/src/page/basicInfo/locType/LocTypeCreate.jsx | 7 +++++++
rsf-admin/src/page/basicInfo/locType/LocTypeEdit.jsx | 7 +++++++
rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx | 4 ++--
rsf-admin/src/i18n/zh.js | 1 +
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 2 +-
rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx | 1 +
rsf-admin/src/i18n/en.js | 1 +
rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx | 4 ++--
rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx | 4 +++-
10 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 72fc56e..dad32ca 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -358,6 +358,7 @@
},
locType: {
uuid: "uuid",
+ code: "code",
name: "name",
regex: "regex",
},
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 3a328f8..f2ae4ea 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -359,6 +359,7 @@
},
locType: {
name: "搴撲綅绫诲瀷",
+ code: "缂栧彿",
regex: "瑙勫垯琛ㄨ揪寮�",
},
locArea: {
diff --git a/rsf-admin/src/page/basicInfo/locType/LocTypeCreate.jsx b/rsf-admin/src/page/basicInfo/locType/LocTypeCreate.jsx
index 7ba5cd2..562ede3 100644
--- a/rsf-admin/src/page/basicInfo/locType/LocTypeCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/locType/LocTypeCreate.jsx
@@ -101,6 +101,13 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
+ label="table.field.locType.code"
+ source="code"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
label="table.field.locType.regex"
source="regex"
parse={v => v}
diff --git a/rsf-admin/src/page/basicInfo/locType/LocTypeEdit.jsx b/rsf-admin/src/page/basicInfo/locType/LocTypeEdit.jsx
index 24b68d7..a630b99 100644
--- a/rsf-admin/src/page/basicInfo/locType/LocTypeEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/locType/LocTypeEdit.jsx
@@ -80,6 +80,13 @@
</Stack>
<Stack direction='row' gap={2}>
<TextInput
+ label="table.field.locType.code"
+ source="code"
+ parse={v => v}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
label="table.field.locType.regex"
source="regex"
parse={v => v}
diff --git a/rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx b/rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx
index 7ce506d..45a4e4d 100644
--- a/rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx
+++ b/rsf-admin/src/page/basicInfo/locType/LocTypeList.jsx
@@ -116,6 +116,7 @@
<NumberField source="id" />
{/* <TextField source="uuid" label="table.field.locType.uuid" /> */}
<TextField source="name" label="table.field.locType.name" />
+ <TextField source="code" label="table.field.locType.code" />
<TextField source="regex" label="table.field.locType.regex" />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index ba9be18..98e6a0c 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -205,7 +205,7 @@
<BooleanField key="statusBool" source="statusBool" label="common.field.status" sortable={false} />,
<TextField key="memo" source="memo" label="common.field.memo" sortable={false} />,
]
- const fields = data.map(el => <TextField key={el.fields} source={el.fields} label={el.fieldsAlise} />)
+ const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
const opt = <WrapperField key="opt" cellClassName="opt" label="common.field.opt">
<EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
<EnableButton />
diff --git a/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx b/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
index 7de55f8..4bb496e 100644
--- a/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/PrintModal.jsx
@@ -98,7 +98,9 @@
</FormControl>
<Box>
- <div ref={contentRef}>11</div>
+ <div ref={contentRef}>
+ 11
+ </div>
</Box>
</DialogContent>
<DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
index 82d24d1..fc150e8 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
@@ -94,14 +94,14 @@
/>
</Grid>
- {/* <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.warehouse.code"
source="code"
validate={[required()]}
parse={v => v}
/>
- </Grid> */}
+ </Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.warehouse.name"
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
index e95a188..18c97bd 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
@@ -80,14 +80,14 @@
autoFocus
/>
</Stack>
- {/* <Stack direction='row' gap={2}>
+ <Stack direction='row' gap={2}>
<TextInput
label="table.field.warehouse.code"
source="code"
validate={[required()]}
parse={v => v}
/>
- </Stack> */}
+ </Stack>
<Stack direction='row' gap={2}>
<TextInput
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
index f026d2f..ca962cd 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
@@ -123,7 +123,7 @@
<NumberField source="id" />
<TextField source="factory" label="table.field.warehouse.factory" />
<TextField source="name" label="table.field.warehouse.name" />
- {/* <TextField source="code" label="table.field.warehouse.code" /> */}
+ <TextField source="code" label="table.field.warehouse.code" />
<TextField source="address" label="table.field.warehouse.address" />
<TextField source="longitude" label="table.field.warehouse.longitude" />
<TextField source="latgitude" label="table.field.warehouse.latgitude" />
--
Gitblit v1.9.1