From c2e6fd5492f27d9c3a9786905036bb89518c7c4a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 三月 2025 10:45:16 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx | 4 +-
rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx | 1
rsf-admin/src/i18n/zh.js | 4 +-
rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupList.jsx | 2
rsf-admin/src/page/basicInfo/locAreaMat/BindMatnrModal.jsx | 1
rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupCreate.jsx | 4 +-
rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx | 10 ++++
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx | 22 +++++-----
rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx | 29 +++++++++-----
rsf-admin/src/page/system/menu/MenuEdit.jsx | 16 ++++++--
10 files changed, 58 insertions(+), 35 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index f6dd347..7044fee 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -329,8 +329,8 @@
splrBtch: "渚涘簲鍟嗘壒娆�",
},
loc: {
- warehouseId: "浠撳簱",
- areaId: "搴撳尯",
+ warehouseId: "鎵�灞炰粨搴�",
+ areaId: "鎵�灞炲簱鍖�",
code: "缂栫爜",
type: "搴撲綅绫诲瀷",
name: "鍚嶇О",
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index 57035a4..debec59 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -182,21 +182,21 @@
value={formData.type}
onChange={(e) => handleChange(+e.target.value, 'type')}
size="small"
- dictTypeCode="sys_bill_type"
+ dictTypeCode="sys_order_type"
/>
</Grid>
- {/* <Grid item xs={4}>
- <TextField
- label={translate('table.field.asnOrder.wkType')}
- name="wkType"
- value={formData.wkType}
- onChange={handleChange}
- variant="outlined"
- size="small"
- />
- </Grid> */}
+ <Grid item xs={4}>
+ <DictionarySelect
+ label={translate("table.field.asnOrder.wkType")}
+ name="wkType"
+ value={formData.wkType}
+ onChange={(e) => handleChange(+e.target.value, 'wkType')}
+ size="small"
+ dictTypeCode="sys_business_type"
+ />
+ </Grid>
</Grid>
</Form>
</Box>
diff --git a/rsf-admin/src/page/basicInfo/locAreaMat/BindMatnrModal.jsx b/rsf-admin/src/page/basicInfo/locAreaMat/BindMatnrModal.jsx
index 9523f61..6de436b 100644
--- a/rsf-admin/src/page/basicInfo/locAreaMat/BindMatnrModal.jsx
+++ b/rsf-admin/src/page/basicInfo/locAreaMat/BindMatnrModal.jsx
@@ -177,6 +177,7 @@
resource={'matnrGroup'}
source="groupId"
value={formData.groupId}
+ validate={required()}
onChange={(e) => handleChange(e.target.value, 'groupId')}
/>
</Grid>
diff --git a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx
index 6ca9111..18268bf 100644
--- a/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx
+++ b/rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatPanel.jsx
@@ -25,10 +25,10 @@
const columns = [
{ field: 'id', headerName: 'ID', width: 100 },
{ field: 'areaId$', headerName: translate('table.field.locAreaMatRela.areaId'), width: 100 },
+ { field: 'locId$', headerName: translate('table.field.locAreaMatRela.locId'), width: 100 },
+ { field: 'locTypeId$', headerName: translate('table.field.locAreaMatRela.locTypeId'), width: 100 },
{ field: 'matnrId$', headerName: translate('table.field.locAreaMatRela.matnrId'), width: 100 },
{ field: 'groupId$', headerName: translate('table.field.locAreaMatRela.groupId'), width: 100 },
- { field: 'locTypeId$', headerName: translate('table.field.locAreaMatRela.locTypeId'), width: 100 },
- { field: 'locId$', headerName: translate('table.field.locAreaMatRela.locId'), width: 100 },
{
field: 'action',
headerName: '鎿嶄綔',
@@ -60,6 +60,8 @@
const [parmas, setParmas] = useState({
areaMatId: record.id,
+ locTypeId: '',
+ groupId: '',
});
const [tableData, setTableData] = useState([]);
@@ -111,12 +113,12 @@
<Grid container spacing={2}>
{/* 鐗╂枡鍒嗙粍 */}
<Grid item xs={2}>
- <MatnrTree matnrTree={matnrTree} setParmas={setParmas} reload={reload} />
+ <MatnrTree matnrTree={matnrTree} parmas={parmas} setParmas={setParmas} reload={reload} />
</Grid>
{/* 搴撲綅绫诲瀷 */}
<Grid item xs={2}>
- <LocTree locTree={locTree} setParmas={setParmas} reload={reload} />
+ <LocTree locTree={locTree} parmas={parmas} setParmas={setParmas} reload={reload} />
</Grid>
{/* 鍏朵粬鍐呭 */}
@@ -139,7 +141,7 @@
export default LocAreaMatPanel;
-const MatnrTree = ({ matnrTree, setParmas, reload }) => {
+const MatnrTree = ({ matnrTree, parmas, setParmas, reload }) => {
const record = useRecordContext();
const notify = useNotify();
@@ -214,7 +216,7 @@
groupId: selectedItems
}
- const res = await request.post(`/locAreaMatRela/group/remove/`, parmas);
+ const res = await request.post(`/locAreaMatRela/group/remove`, parmas);
if (res?.data?.code === 200) {
reload()
notify(res.data.msg);
@@ -231,7 +233,10 @@
};
const handleNodeSelect = (event, nodeId) => {
- event.stopPropagation()
+ event.stopPropagation();
+ parmas.groupId = nodeId;
+ setParmas(parmas)
+ reload()
};
return (
@@ -251,10 +256,10 @@
multiSelect
items={matnrTree}
apiRef={apiRef}
- selectedItems={selectedItems}
getItemId={(item) => item.id}
getItemLabel={(item) => item.name}
defaultExpandedItems={['grid']}
+ selectedItems={selectedItems}
onSelectedItemsChange={handleSelectedItemsChange}
onItemSelectionToggle={handleItemSelectionToggle}
onItemClick={handleNodeSelect}
@@ -276,7 +281,7 @@
)
}
-const LocTree = ({ locTree, setParmas, reload }) => {
+const LocTree = ({ locTree, setParmas, parmas, reload }) => {
const record = useRecordContext();
const notify = useNotify();
@@ -364,8 +369,10 @@
};
const handleNodeSelect = (event, nodeId) => {
- // event.preventDefault();
- console.log(nodeId)
+ event.stopPropagation();
+ parmas.locTypeId = nodeId;
+ setParmas(parmas)
+ reload()
};
return (
diff --git a/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupCreate.jsx b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupCreate.jsx
index 4c9aa78..6e2a958 100644
--- a/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupCreate.jsx
@@ -93,14 +93,14 @@
validate={required()}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.matnrGroup.code"
source="code"
parse={v => v}
validate={required()}
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.matnrGroup.parentId"
diff --git a/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx
index 1cfd61c..ad0a7d7 100644
--- a/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx
@@ -64,13 +64,13 @@
validate={required()}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.matnrGroup.code"
source="code"
parse={v => v}
/>
- </Grid>
+ </Grid> */}
</Grid>
)
}
diff --git a/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupList.jsx b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupList.jsx
index 5b22181..b7436b2 100644
--- a/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupList.jsx
@@ -269,7 +269,7 @@
{expandAll ? translate('common.action.collapseAll') : translate('common.action.expandAll')}
</Button>
<TextField
- label="Search"
+ label="鎼滅储"
value={filter}
onChange={({ target }) => {
setFilter(target.value)
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
index fc150e8..daf37a0 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
@@ -157,7 +157,6 @@
multiline
minRows={2}
autoFocus
- {...props}
/>
{/* <Stack direction="column" spacing={1} width={'100%'}>
<MemoInput />
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
index c04ccc1..b8d67b3 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
@@ -134,7 +134,15 @@
</Typography>
<StatusSelectInput />
<Box mt="2em" />
- <MemoInput />
+ <TextInput
+ label="common.field.memo"
+ source="memo"
+ parse={v => v}
+ fullWidth
+ multiline
+ minRows={2}
+ autoFocus
+ />
</Grid>
</Grid>
</SimpleForm>
diff --git a/rsf-admin/src/page/system/menu/MenuEdit.jsx b/rsf-admin/src/page/system/menu/MenuEdit.jsx
index 0f79182..098c6a3 100644
--- a/rsf-admin/src/page/system/menu/MenuEdit.jsx
+++ b/rsf-admin/src/page/system/menu/MenuEdit.jsx
@@ -57,6 +57,7 @@
<TextInput
label="table.field.menu.route"
source="route"
+ validate={required()}
parse={v => v}
/>
</Grid>
@@ -71,6 +72,7 @@
<SelectInput
label="table.field.menu.type"
source="type"
+ validate={required()}
choices={[
{ id: 0, name: 'table.field.menu.enums.menu' },
{ id: 1, name: 'table.field.menu.enums.button' },
@@ -101,10 +103,16 @@
<Grid item xs={6} display="flex" gap={1}>
<StatusSelectInput />
</Grid>
- <Grid item xs={12} display="flex" gap={1}>
- <Stack direction="column" spacing={1} width={'100%'}>
- <MemoInput />
- </Stack>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="common.field.memo"
+ source="memo"
+ parse={v => v}
+ fullWidth
+ multiline
+ minRows={2}
+ autoFocus
+ />
</Grid>
</Grid>
)
--
Gitblit v1.9.1