From 183d1e50c7b9a040e39eec36de81e5331aa7b31c Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 26 三月 2025 08:58:12 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/asnOrder/AsnWareModal.jsx | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnWareModal.jsx b/rsf-admin/src/page/asnOrder/AsnWareModal.jsx
index 1b1200d..52e92f7 100644
--- a/rsf-admin/src/page/asnOrder/AsnWareModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnWareModal.jsx
@@ -55,7 +55,7 @@
const value = selectedData.map((el => {
return {
matnrId: el.id,
- matnk: el.name,
+ maktx: el.name,
stockUnit: el.stockUnit || '',
purUnit: el.purchaseUnit || '',
}
@@ -128,6 +128,16 @@
size="small"
/>
</Grid>
+ <Grid item xs={4}>
+ <TextField
+ label={translate('table.field.matnr.groupId')}
+ name="groupId"
+ value={formData.groupId}
+ onChange={handleChange}
+ variant="outlined"
+ size="small"
+ />
+ </Grid>
</Grid>
</Box>
<Box sx={{ mt: 2 }}>
@@ -144,7 +154,7 @@
<DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
<Box sx={{ width: '100%', display: 'flex', justifyContent: 'space-between' }}>
<Button onClick={handleSubmit} variant="contained" startIcon={<SaveIcon />}>
- 纭
+ {translate('toolbar.confirm')}
</Button>
</Box>
</DialogActions>
--
Gitblit v1.9.1