From b7d3b5954bc0f811c85b0c4efb9c2095ddef9a99 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 26 八月 2025 11:10:10 +0800
Subject: [PATCH] 单据同步功能优化 单据修改接口优化
---
rsf-admin/src/page/stockManage/locRevise/LocReviseList.jsx | 99 +++++++++++++++++++++++++++++++------------------
1 files changed, 62 insertions(+), 37 deletions(-)
diff --git a/rsf-admin/src/page/stockManage/locRevise/LocReviseList.jsx b/rsf-admin/src/page/stockManage/locRevise/LocReviseList.jsx
index 18d5ca9..86546a3 100644
--- a/rsf-admin/src/page/stockManage/locRevise/LocReviseList.jsx
+++ b/rsf-admin/src/page/stockManage/locRevise/LocReviseList.jsx
@@ -25,6 +25,7 @@
TextInput,
DateTimeInput,
DateInput,
+ useRefresh,
SelectInput,
NumberInput,
ReferenceInput,
@@ -35,14 +36,13 @@
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import MyCreateButton from "@/page/components/MyCreateButton";
import MyExportButton from '@/page/components/MyExportButton';
-import { Box, Typography, Card, Stack } from '@mui/material';
-import PageDrawer from "@/page/components/PageDrawer";
-import EmptyData from "@/page/components/EmptyData";
+import PageEditDrawer from "@/page/components/PageEditDrawer";
+import { Box, Typography, Card, Stack, Switch } from '@mui/material';
+import ConfirmButton from '../../components/ConfirmButton';
import LocReviseCreate from "./LocReviseCreate";
-import MyField from "@/page/components/MyField";
+import TaskIcon from '@mui/icons-material/Task';
import { styled } from '@mui/material/styles';
-import LocRevisePanel from "./LocRevisePanel";
-import * as Common from '@/utils/common';
+import request from '@/utils/request';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -62,12 +62,12 @@
<SearchInput source="condition" alwaysOn />,
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
<TextInput source="code" label="table.field.locRevise.code" />,
<SelectInput source="type" label="table.field.locRevise.type"
choices={[
{ id: 0, name: ' 搴撳瓨璋冩暣' },
- { id: 2, name: ' 鐩樼偣璋冩暣' },
+ { id: 1, name: ' 鐩樼偣璋冩暣' },
+ { id: 2, name: ' 鍏跺畠璋冩暣' },
]}
/>,
<NumberInput source="anfme" label="table.field.locRevise.anfme" />,
@@ -75,13 +75,12 @@
<SelectInput source="exceStatus" label="table.field.locRevise.exceStatus"
choices={[
{ id: 0, name: '鏈墽琛�' },
- { id: 1, name: '鎵ц涓�' },
- { id: 2, name: '鎵ц瀹屾垚' },
+ { id: 1, name: '鎵ц涓�' },
+ { id: 2, name: '鎵ц瀹屾垚' },
]}
/>,
<NumberInput source="orgAreaId" label="table.field.locRevise.orgAreaId" />,
<TextInput source="orgAreaName" label="table.field.locRevise.orgAreaName" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -95,10 +94,9 @@
]
const LocReviseList = () => {
- const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
+ const translate = useTranslate();
return (
<Box display="flex">
@@ -127,49 +125,76 @@
>
<StyledDatagrid
preferenceKey='locRevise'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- expand={() => <LocRevisePanel />}
+ expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'areaId', 'memo']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.locRevise.code" />
<TextField source="type$" label="table.field.locRevise.type" sortable={false} />
- <NumberField source="anfme" label="table.field.locRevise.anfme" />
- <NumberField source="reviseQty" label="table.field.locRevise.reviseQty" />
+ {/* <NumberField source="anfme" label="table.field.locRevise.anfme" />
+ <NumberField source="reviseQty" label="table.field.locRevise.reviseQty" /> */}
+ <NumberField source="areaId" label="table.field.locRevise.areaId" />
+ <TextField source="areaName" label="table.field.locRevise.areaName" />
<TextField source="exceStatus$" label="table.field.locRevise.exceStatus" sortable={false} />
- <NumberField source="orgAreaId" label="table.field.locRevise.orgAreaId" />
- <TextField source="orgAreaName" label="table.field.locRevise.orgAreaName" />
-
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <TextField source="createBy$" label="common.field.createBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
<EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ <DelButton />
+ <CompleteButton />
</WrapperField>
</StyledDatagrid>
</List>
- <LocReviseCreate
- open={createDialog}
- setOpen={setCreateDialog}
- />
- <PageDrawer
- title='LocRevise Detail'
- drawerVal={drawerVal}
- setDrawerVal={setDrawerVal}
+ <PageEditDrawer
+ title={"toolbar.createLocRevise"}
+ drawerVal={createDialog}
+ setDrawerVal={setCreateDialog}
>
- </PageDrawer>
+ <LocReviseCreate
+ open={createDialog}
+ setOpen={setCreateDialog}
+ />
+ </PageEditDrawer>
</Box>
)
}
+const DelButton = () => {
+ const record = useRecordContext();
+ return (
+ record?.exceStatus == 0 ? <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> : <></>
+ )
+}
+
+//瀹屾垚鍗曟嵁
+const CompleteButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+ const requestComplete = async () => {
+ const { data: { code, data, msg } } = await request.post(`/reviseLog/complete/${record.id}`);
+ if (code === 200) {
+ notify(msg);
+ refresh()
+ } else {
+ notify(msg);
+ }
+ }
+
+ return (
+ record.exceStatus == 1 ? <ConfirmButton label={"toolbar.confirmTransfer"} color="secondary" startIcon={<TaskIcon />} onConfirm={requestComplete} size="small" /> : <></>
+ )
+
+}
+
+
+
+
export default LocReviseList;
--
Gitblit v1.9.1