From 5c90daa2c919f3f07df0a154ff91f0e015bf8d66 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 24 七月 2025 17:07:28 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/check/SelectMatnrModal.jsx | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx b/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx
index 3ee3738..b91f92f 100644
--- a/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx
+++ b/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx
@@ -83,7 +83,8 @@
const [formData, setFormData] = useState({
type: '',
- wkType: '',
+ wkType: '7',
+ checkType: '0',
poCode: '',
logisNo: '',
arrTime: ''
@@ -101,7 +102,8 @@
const resetData = () => {
setFormData({
type: '',
- wkType: '',
+ wkType: '7',
+ checkType: '0',
poCode: '',
logisNo: '',
arrTime: ''
@@ -174,7 +176,7 @@
}
const requestGetBody = async () => {
- const res = await request.post(`/checkItem/page`, { asnId });
+ const res = await request.post(`/checkItem/page`, { orderId: asnId });
if (res?.data?.code === 200) {
setTableData(res.data.data.records)
} else {
@@ -217,11 +219,21 @@
<Grid container spacing={2}>
<Grid item md={2}>
<DictSelect
- label={translate("table.field.checkOrder.checkType")}
+ label={translate("table.field.checkOrder.type")}
value={formData.wkType}
variant="filled"
onChange={(e) => handleChange(e.target.value, 'wkType')}
dictTypeCode="sys_check_order_type"
+ required
+ />
+ </Grid>
+ <Grid item md={2}>
+ <DictSelect
+ label={translate("table.field.checkOrder.checkType")}
+ value={formData.checkType}
+ variant="filled"
+ onChange={(e) => handleChange(e.target.value, 'checkType')}
+ dictTypeCode="sys_check_type"
required
/>
</Grid>
@@ -240,8 +252,10 @@
</Box>
<Box sx={{ mt: 2 }}>
<Stack direction="row" spacing={2}>
- <Button variant="contained" onClick={() => setCreateDialog(true)}>鏂板鐗╂枡</Button>
- <ConfirmButton label={'鍒犻櫎'} variant="outlined" color="error" onConfirm={handleDeleteItem} />
+ <Button variant="contained" onClick={() => setCreateDialog(true)} >
+ {translate('common.action.newAddMats')}
+ </Button>
+ <ConfirmButton label={"toolbar.delete"} variant="outlined" color="error" onConfirm={handleDeleteItem} />
</Stack>
</Box>
<Box sx={{ mt: 2 }}>
--
Gitblit v1.9.1