From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx | 61 ++++++++++++++++--------------
1 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
index d001fde..bbba6ff 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx
@@ -246,34 +246,29 @@
required
/>
</Grid>
- <Grid item md={3}>
+ <Grid item md={2}>
<TextField
label={translate("table.field.asnOrder.poCode")}
value={formData.poCode}
+ variant="filled"
onChange={(e) => handleChange(e.target.value, 'poCode')}
/>
</Grid>
- <Grid item md={3}>
+ <Grid item md={2}>
<TextField
label={translate("table.field.asnOrder.logisNo")}
value={formData.logisNo}
+ variant="filled"
onChange={(e) => handleChange(e.target.value, 'logisNo')}
/>
</Grid>
-
<Grid item md={3}>
- {/* <TextField
- label={translate("table.field.asnOrder.arrTime")}
- value={formData.arrTime}
- onChange={(e) => handleChange(e.target.value, 'arrTime')}
- /> */}
<DateInput
source="arrTime"
label="table.field.asnOrder.arrTime"
value={formData.arrTime}
onChange={(e) => handleChange(e.target.value, 'arrTime')}
/>
-
</Grid>
</Grid>
</Form>
@@ -434,17 +429,16 @@
const notify = useNotify();
const [columns, setColumns] = useState([
-
- {
- field: 'maktx',
- headerName: translate('table.field.asnOrderItem.maktx'),
- width: 250,
- editable: false,
- },
{
field: 'matnrCode',
headerName: translate('table.field.asnOrderItem.matnrCode'),
width: 130,
+ editable: false,
+ },
+ {
+ field: 'maktx',
+ headerName: translate('table.field.asnOrderItem.maktx'),
+ width: 250,
editable: false,
},
{
@@ -468,17 +462,17 @@
),
headerClassName: "custom",
},
- {
- field: 'splrName',
- headerName: translate('table.field.asnOrderItem.splrName') + "*",
- minWidth: 100,
- flex: 1,
- editable: true,
- renderEditCell: (params) => (
- <SelectInputSplrNameEditCell {...params} />
- ),
- headerClassName: "custom",
- },
+ // {
+ // field: 'splrName',
+ // headerName: translate('table.field.asnOrderItem.splrName') + "*",
+ // minWidth: 100,
+ // flex: 1,
+ // editable: true,
+ // renderEditCell: (params) => (
+ // <SelectInputSplrNameEditCell {...params} />
+ // ),
+ // headerClassName: "custom",
+ // },
// {
// field: 'packName',
// headerName: translate('table.field.asnOrderItem.packName'),
@@ -493,14 +487,23 @@
// flex: 1,
// },
{
- field: 'poCode',
- headerName: translate('table.field.asnOrderItem.poDetlCode') + "*",
+ field: 'platItemId',
+ headerName: translate('table.field.asnOrderItem.platItemId') + "*",
minWidth: 100,
flex: 1,
editable: true,
headerClassName: "custom",
},
+ // {
+ // field: 'poCode',
+ // headerName: translate('table.field.asnOrderItem.poDetlCode') + "*",
+ // minWidth: 100,
+ // flex: 1,
+ // editable: true,
+ // headerClassName: "custom",
+ // },
+
{
field: 'stockUnit',
headerName: translate('table.field.asnOrderItem.stockUnit'),
--
Gitblit v1.9.1