From a64d342c0371eadebc29dae2a60a9525ce95e222 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 09 四月 2025 17:04:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index a6d4d10..1791f4d 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -88,6 +88,8 @@
const [formData, setFormData] = useState({
type: '',
wkType: '',
+ poCode: '',
+ logisNo: ''
});
const [tabelData, setTableData] = useState([]);
@@ -104,6 +106,8 @@
setFormData({
type: '',
wkType: '',
+ poCode: '',
+ logisNo: ''
})
setTableData([])
}
@@ -222,7 +226,7 @@
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 3 }}>
<Form>
<Grid container spacing={2}>
- <Grid item md={4}>
+ <Grid item md={3}>
<DictSelect
label={translate("table.field.asnOrder.type")}
value={formData.type}
@@ -234,13 +238,29 @@
</Grid>
- <Grid item md={4}>
+ <Grid item md={3}>
<DictSelect
label={translate("table.field.asnOrder.wkType")}
value={formData.wkType}
onChange={(e) => handleChange(e.target.value, 'wkType')}
dictTypeCode="sys_business_type"
required
+ />
+ </Grid>
+
+ <Grid item md={3}>
+ <TextField
+ label={translate("table.field.asnOrder.poCode")}
+ value={formData.poCode}
+ onChange={(e) => handleChange(e.target.value, 'poCode')}
+ />
+ </Grid>
+
+ <Grid item md={3}>
+ <TextField
+ label={translate("table.field.asnOrder.logisNo")}
+ value={formData.logisNo}
+ onChange={(e) => handleChange(e.target.value, 'logisNo')}
/>
</Grid>
</Grid>
@@ -460,8 +480,14 @@
disableColumnSorting
disableMultipleColumnsSorting
processRowUpdate={processRowUpdate}
- pageSizeOptions={[25, 50, 100]}
- paginationModel={{ pageSize: 50, page: 0 }}
+ initialState={{
+ pagination: {
+ paginationModel: {
+ pageSize: 25,
+ },
+ },
+ }}
+ pageSizeOptions={[10, 25, 50, 100]}
editMode="row"
checkboxSelection
onRowSelectionModelChange={handleSelectionChange}
--
Gitblit v1.9.1