From 03faa035cda5bdc060095b9a2a2b9e8fae5aed09 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 09 四月 2025 15:34:46 +0800
Subject: [PATCH] fix:收货单增加字段
---
rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx | 10 ++++-
rsf-admin/src/page/system/role/RoleList.jsx | 4 --
rsf-admin/src/page/asnOrderLog/AsnOrderLogList.jsx | 28 +++++++++++++
rsf-admin/src/i18n/zh.js | 3 +
rsf-admin/src/i18n/en.js | 1
rsf-admin/src/page/system/role/AssignPermissions.jsx | 5 +-
rsf-admin/src/config/setting.js | 2
rsf-admin/src/page/system/user/UserList.jsx | 4 --
rsf-admin/src/page/asnOrder/AsnOrderModal.jsx | 34 +++++++++++++++--
9 files changed, 71 insertions(+), 20 deletions(-)
diff --git a/rsf-admin/src/config/setting.js b/rsf-admin/src/config/setting.js
index 18ec5ad..9fe0af1 100644
--- a/rsf-admin/src/config/setting.js
+++ b/rsf-admin/src/config/setting.js
@@ -15,7 +15,7 @@
export const DEFAULT_THEME_NAME = 'rsf';
-export const DEFAULT_THEME_MODE = 'dark';
+export const DEFAULT_THEME_MODE = 'light';
export const TOKEN_HEADER_NAME = 'Authorization';
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 2e67cf6..daf2177 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -840,6 +840,7 @@
close: "close",
asnCreate: "asnCreate",
createTask: "createTask",
+ recover: "recover",
},
};
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 55c4ec9..7a43338 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -537,7 +537,7 @@
packName: "鍖呰鍚嶇О",
ntyStatus: "鎶ユ鐘舵��",
prodTime: "鐢熶骇鏃ユ湡",
- platItemId: 'PO琛屽彿'
+ platItemId: 'PO鍗曞彿'
},
asnOrderLog: {
code: "缂栫爜",
@@ -854,6 +854,7 @@
close: "鍏抽棴",
asnCreate: "閫氳繃ASN鍒涘缓",
createTask: "鐢熸垚浠诲姟",
+ recover: "缁х画鏀惰揣",
},
};
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}
diff --git a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
index 23d04c3..3a6c137 100644
--- a/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
+++ b/rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx
@@ -168,8 +168,14 @@
disableMultipleColumnsSorting
columnHeaderHeight={40}
rowHeight={42}
- paginationModel={{ pageSize: 10, page: 1 }}
- pageSizeOptions={[10, 25, 50, 100]}
+ initialState={{
+ pagination: {
+ paginationModel: {
+ pageSize: 10,
+ },
+ },
+ }}
+ pageSizeOptions={[10, 25, 50]}
/>
</Box >
diff --git a/rsf-admin/src/page/asnOrderLog/AsnOrderLogList.jsx b/rsf-admin/src/page/asnOrderLog/AsnOrderLogList.jsx
index a4e8f60..78ae947 100644
--- a/rsf-admin/src/page/asnOrderLog/AsnOrderLogList.jsx
+++ b/rsf-admin/src/page/asnOrderLog/AsnOrderLogList.jsx
@@ -31,6 +31,8 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ useRefresh,
+ Button,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -43,6 +45,7 @@
import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
+import ReplayIcon from '@mui/icons-material/Replay';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -54,7 +57,7 @@
'& .column-name': {
},
'& .opt': {
- width: 200
+ width: 300
},
}));
@@ -161,6 +164,7 @@
<WrapperField cellClassName="opt" label="common.field.opt">
<EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
<DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ <RecoverButton />
</WrapperField>
</StyledDatagrid>
</List>
@@ -179,3 +183,25 @@
}
export default AsnOrderLogList;
+
+const RecoverButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const requestRecover = async () => {
+ const { data: { code, data, msg } } = await request.post(`/asnOrder/recover/${record.id}`);
+
+ if (code === 200) {
+ notify(msg);
+ refresh()
+ } else {
+ notify(msg);
+ }
+ }
+
+ return (
+ (<Button onClick={requestRecover} label={"toolbar.recover"} color="success">
+ <ReplayIcon />
+ </Button>)
+ )
+}
diff --git a/rsf-admin/src/page/system/role/AssignPermissions.jsx b/rsf-admin/src/page/system/role/AssignPermissions.jsx
index d9fd08b..7be80ae 100644
--- a/rsf-admin/src/page/system/role/AssignPermissions.jsx
+++ b/rsf-admin/src/page/system/role/AssignPermissions.jsx
@@ -177,11 +177,11 @@
<Card sx={{
ml: 1,
mr: 1,
- height: '620px'
+ height: 'calc(100vh - 140px)',
+ overflowY: 'auto'
}}>
<CardContent sx={{
overflow: 'auto',
- height: '100%',
display: 'flex',
flexDirection: 'column',
justifyContent: 'space-between'
@@ -218,7 +218,6 @@
</Box>
<Box sx={{
- height: 480,
minWidth: 290,
overflow: 'auto',
marginTop: '10px',
diff --git a/rsf-admin/src/page/system/role/RoleList.jsx b/rsf-admin/src/page/system/role/RoleList.jsx
index f02ac2d..cdecd51 100644
--- a/rsf-admin/src/page/system/role/RoleList.jsx
+++ b/rsf-admin/src/page/system/role/RoleList.jsx
@@ -61,8 +61,6 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" alwaysOn />,
- <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
<TextInput source="name" label="table.field.role.name" />,
<TextInput source="code" label="table.field.role.code" />,
@@ -132,8 +130,6 @@
preferenceKey='role'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- expand={() => <RolePanel />}
- expandSingle={true}
omit={['id', 'createTime', 'memo']}
>
<NumberField source="id" />
diff --git a/rsf-admin/src/page/system/user/UserList.jsx b/rsf-admin/src/page/system/user/UserList.jsx
index 7906b2f..12e20c8 100644
--- a/rsf-admin/src/page/system/user/UserList.jsx
+++ b/rsf-admin/src/page/system/user/UserList.jsx
@@ -91,8 +91,6 @@
const filters = [
// <SearchInput source="condition" alwaysOn />,
- <DateInput label="common.time.after" source="timeStart" alwaysOn />,
- <DateInput label="common.time.before" source="timeEnd" alwaysOn />,
<TextInput source="username" label="table.field.user.username" />,
<TextInput source="nickname" label="table.field.user.nickname" />,
@@ -148,8 +146,6 @@
<BulkDeleteButton mutationMode={OPERATE_MODE} />
)}
rowClick={(id, resource, record) => false}
- expand={() => <UserPanel />}
- expandSingle={true}
omit={[
"id",
"email",
--
Gitblit v1.9.1