From 2da12c3d55a709241d245d0ca6a22b56e4c048a0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 09 四月 2025 14:04:19 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx | 8 +++++---
rsf-admin/src/page/fields/FieldsEdit.jsx | 8 +++++---
rsf-admin/src/page/fields/FieldsList.jsx | 6 ++----
rsf-admin/src/i18n/zh.js | 2 +-
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx | 8 +++-----
rsf-admin/src/page/fields/FieldsCreate.jsx | 10 +++++++---
6 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 8b0c4ab..55c4ec9 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -609,7 +609,7 @@
fields: {
fields: "瀛楁",
fieldsAlise: "瀛楁鍒悕",
- unique: "绱㈠紩瀛楁",
+ unique: "鏄惁蹇呭～",
flagEnable: "鍚敤",
},
fieldsItem: {
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
index e8fa4ac..a6d4d10 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderModal.jsx
@@ -307,10 +307,7 @@
minWidth: 100,
flex: 1,
editable: true,
- // preProcessEditCellProps: (params) => {
- // const hasError = params.props.value.length !== '';
- // return { ...params.props, error: hasError };
- // },
+ valueFormatter: (val) => val < 0 ? 0 : val
},
{
field: 'splrCode',
@@ -463,7 +460,8 @@
disableColumnSorting
disableMultipleColumnsSorting
processRowUpdate={processRowUpdate}
- autoPageSize
+ pageSizeOptions={[25, 50, 100]}
+ paginationModel={{ pageSize: 50, page: 0 }}
editMode="row"
checkboxSelection
onRowSelectionModelChange={handleSelectionChange}
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
index 00c0a89..23d04c3 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
@@ -140,15 +140,13 @@
}
-
return (
<Box sx={{
position: 'relative',
padding: '5px 10px'
}}>
-
<div style={{ display: 'flex', justifyContent: 'space-between', marginBottom: '4px', alignItems: 'center' }}>
- <TextField value={maktx} onChange={(e) => maktxChange(e.target.value)} label="鎼滅储鐗╂枡" variant="outlined" sx={{ width: '300px' }} size="small" />
+ <TextField value={maktx} onChange={(e) => maktxChange(e.target.value)} label="鎼滅储鐗╂枡" sx={{ width: '300px' }} size="small" />
<div style={{ display: 'flex', gap: '10px' }}>
<PrintsButton rows={selectedRows} />
@@ -168,6 +166,10 @@
disableColumnMenu={true}
disableColumnSorting
disableMultipleColumnsSorting
+ columnHeaderHeight={40}
+ rowHeight={42}
+ paginationModel={{ pageSize: 10, page: 1 }}
+ pageSizeOptions={[10, 25, 50, 100]}
/>
</Box >
diff --git a/rsf-admin/src/page/fields/FieldsCreate.jsx b/rsf-admin/src/page/fields/FieldsCreate.jsx
index cd84b28..87afbb0 100644
--- a/rsf-admin/src/page/fields/FieldsCreate.jsx
+++ b/rsf-admin/src/page/fields/FieldsCreate.jsx
@@ -89,6 +89,7 @@
label="table.field.fields.fields"
source="fields"
parse={v => v}
+ validate={required()}
autoFocus
/>
</Grid>
@@ -96,6 +97,7 @@
<TextInput
label="table.field.fields.fieldsAlise"
source="fieldsAlise"
+ validate={required()}
parse={v => v}
/>
</Grid>
@@ -104,9 +106,10 @@
label="table.field.fields.unique"
source="unique"
choices={[
- { id: 0, name: ' 闈炲敮涓�' },
- { id: 1, name: ' 鍞竴' },
+ { id: 0, name: ' 闈炲繀濉�' },
+ { id: 1, name: ' 蹇呭～' },
]}
+ validate={required()}
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -115,8 +118,9 @@
source="flagEnable"
choices={[
{ id: 0, name: ' 涓嶅惎鐢�' },
- { id: 1, name: ' 鍚敤' },
+ { id: 1, name: ' 鍚敤' },
]}
+ validate={required()}
/>
</Grid>
diff --git a/rsf-admin/src/page/fields/FieldsEdit.jsx b/rsf-admin/src/page/fields/FieldsEdit.jsx
index de6bcea..b474bd2 100644
--- a/rsf-admin/src/page/fields/FieldsEdit.jsx
+++ b/rsf-admin/src/page/fields/FieldsEdit.jsx
@@ -69,6 +69,7 @@
source="fields"
parse={v => v}
autoFocus
+ validate={required()}
/>
</Stack>
<Stack direction='row' gap={2}>
@@ -76,6 +77,7 @@
label="table.field.fields.fieldsAlise"
source="fieldsAlise"
parse={v => v}
+ validate={required()}
/>
</Stack>
<Stack direction='row' gap={2}>
@@ -83,8 +85,8 @@
label="table.field.fields.unique"
source="unique"
choices={[
- { id: 0, name: ' 闈炲敮涓�' },
- { id: 1, name: ' 鍞竴' },
+ { id: 0, name: ' 闈炲繀濉�' },
+ { id: 1, name: ' 蹇呭～' },
]}
validate={required()}
/>
@@ -95,7 +97,7 @@
source="flagEnable"
choices={[
{ id: 0, name: ' 涓嶅惎鐢�' },
- { id: 1, name: ' 鍚敤' },
+ { id: 1, name: ' 鍚敤' },
]}
validate={required()}
/>
diff --git a/rsf-admin/src/page/fields/FieldsList.jsx b/rsf-admin/src/page/fields/FieldsList.jsx
index 78970d9..795c931 100644
--- a/rsf-admin/src/page/fields/FieldsList.jsx
+++ b/rsf-admin/src/page/fields/FieldsList.jsx
@@ -60,15 +60,13 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" alwaysOn />,
- <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
<TextInput source="fields" label="table.field.fields.fields" />,
<TextInput source="fieldsAlise" label="table.field.fields.fieldsAlise" />,
<SelectInput source="unique" label="table.field.fields.unique"
choices={[
- { id: 0, name: ' 闈炲敮涓�' },
- { id: 1, name: ' 鍞竴' },
+ { id: 0, name: ' 闈炲繀濉�' },
+ { id: 1, name: ' 蹇呭～' },
]}
/>,
<SelectInput source="flagEnable" label="table.field.fields.flagEnable"
--
Gitblit v1.9.1